From 0aa02fe934efc73f36169d6181713474b5aeb563 Mon Sep 17 00:00:00 2001
From: Justin Sims <justin@216digital.com>
Date: Tue, 21 Jan 2020 09:28:54 -0500
Subject: [PATCH 001/120] Adjusted TransportBuilder prepareMessage method to
 support text/plain template emails

---
 .../Magento/Framework/Mail/Template/TransportBuilder.php   | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/lib/internal/Magento/Framework/Mail/Template/TransportBuilder.php b/lib/internal/Magento/Framework/Mail/Template/TransportBuilder.php
index 830d9b0f722e4..c423d6ec627bb 100644
--- a/lib/internal/Magento/Framework/Mail/Template/TransportBuilder.php
+++ b/lib/internal/Magento/Framework/Mail/Template/TransportBuilder.php
@@ -394,7 +394,12 @@ protected function prepareMessage()
         }
 
         /** @var \Magento\Framework\Mail\MimePartInterface $mimePart */
-        $mimePart = $this->mimePartInterfaceFactory->create(['content' => $content]);
+        $mimePart = $this->mimePartInterfaceFactory->create(
+        	[
+        		'content' => $content,
+        		'type' => $part['type']
+        	]
+        );
         $this->messageData['encoding'] = $mimePart->getCharset();
         $this->messageData['body'] = $this->mimeMessageInterfaceFactory->create(
             ['parts' => [$mimePart]]

From f2b46df5b6a681d63e4254abdb13b49733574db1 Mon Sep 17 00:00:00 2001
From: Marvin Hinz <35603466+marvinhinz@users.noreply.github.com>
Date: Wed, 29 Jan 2020 10:26:40 +0100
Subject: [PATCH 002/120] Improve developer experience: RuntimeException thrown
 by AbstractFactory::createObject now contains the reason.

This implements feature request #26550
---
 .../Magento/Framework/ObjectManager/Factory/AbstractFactory.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/internal/Magento/Framework/ObjectManager/Factory/AbstractFactory.php b/lib/internal/Magento/Framework/ObjectManager/Factory/AbstractFactory.php
index 7094b116ead3f..6df29261998bb 100644
--- a/lib/internal/Magento/Framework/ObjectManager/Factory/AbstractFactory.php
+++ b/lib/internal/Magento/Framework/ObjectManager/Factory/AbstractFactory.php
@@ -129,7 +129,7 @@ protected function createObject($type, $args)
             );
 
             throw new RuntimeException(
-                new Phrase('Type Error occurred when creating object: %type', ['type' => $type])
+                new Phrase('Type Error occurred when creating object: %type, %msg', ['type' => $type, 'msg' => $exception->getMessage()])
             );
         }
     }

From 00971d065a6cc353b83ace91dd65f06efe2640fe Mon Sep 17 00:00:00 2001
From: Marvin Hinz <35603466+marvinhinz@users.noreply.github.com>
Date: Fri, 7 Feb 2020 13:23:06 +0100
Subject: [PATCH 003/120] Fix code check for max line length

---
 .../Framework/ObjectManager/Factory/AbstractFactory.php      | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/lib/internal/Magento/Framework/ObjectManager/Factory/AbstractFactory.php b/lib/internal/Magento/Framework/ObjectManager/Factory/AbstractFactory.php
index 6df29261998bb..735b9454bbfa1 100644
--- a/lib/internal/Magento/Framework/ObjectManager/Factory/AbstractFactory.php
+++ b/lib/internal/Magento/Framework/ObjectManager/Factory/AbstractFactory.php
@@ -129,7 +129,10 @@ protected function createObject($type, $args)
             );
 
             throw new RuntimeException(
-                new Phrase('Type Error occurred when creating object: %type, %msg', ['type' => $type, 'msg' => $exception->getMessage()])
+                new Phrase('Type Error occurred when creating object: %type, %msg', [
+                    'type' => $type, 
+                    'msg' => $exception->getMessage()
+                ])
             );
         }
     }

From b4c2cc5a1df3ff1b4dd5646db1f8125fd8c1fceb Mon Sep 17 00:00:00 2001
From: Yogesh Suhagiya <yksuhagiya@gmail.com>
Date: Thu, 13 Feb 2020 12:41:02 +0530
Subject: [PATCH 004/120] Fixed transaction issues

---
 app/code/Magento/Backend/etc/adminhtml/system.xml | 10 ++++------
 app/code/Magento/Backend/i18n/en_US.csv           |  6 +-----
 2 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/app/code/Magento/Backend/etc/adminhtml/system.xml b/app/code/Magento/Backend/etc/adminhtml/system.xml
index 3a2b3554cc4a0..45ed50fd49b7e 100644
--- a/app/code/Magento/Backend/etc/adminhtml/system.xml
+++ b/app/code/Magento/Backend/etc/adminhtml/system.xml
@@ -115,7 +115,7 @@
                     <label>Enable Template Path Hints for Storefront</label>
                     <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
                 </field>
-                <field id="template_hints_storefront_show_with_parameter" translate="label" type="select" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1">
+                <field id="template_hints_storefront_show_with_parameter" translate="label comment" type="select" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1">
                     <label>Enable Hints for Storefront with URL Parameter</label>
                     <depends>
                         <field id="*/*/template_hints_storefront">1</field>
@@ -123,7 +123,7 @@
                     <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
                     <comment>Use URL parameter to enable template path hints for Storefront</comment>
                 </field>
-                <field id="template_hints_parameter_value" translate="label" type="text" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
+                <field id="template_hints_parameter_value" translate="label comment" type="text" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
                     <label>Parameter Value</label>
                     <depends>
                         <field id="*/*/template_hints_storefront">1</field>
@@ -341,7 +341,7 @@
             </group>
             <group id="upload_configuration" translate="label" type="text" sortOrder="1000" showInDefault="1" showInWebsite="1" showInStore="1">
                 <label>Images Upload Configuration</label>
-                <field id="enable_resize" translate="label" type="select" sortOrder="200" showInDefault="1" canRestore="1">
+                <field id="enable_resize" translate="label comment" type="select" sortOrder="200" showInDefault="1" canRestore="1">
                     <label>Enable Frontend Resize</label>
                     <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
                     <comment>Resize performed via javascript before file upload.</comment>
@@ -459,9 +459,7 @@
                     <label>Add Store Code to Urls</label>
                     <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.).]]>
-                    </comment>
+                    <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.).]]></comment>
                 </field>
                 <field id="redirect_to_base" translate="label comment" type="select" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
                     <label>Auto-redirect to Base URL</label>
diff --git a/app/code/Magento/Backend/i18n/en_US.csv b/app/code/Magento/Backend/i18n/en_US.csv
index 51fe8bfe542a2..d073c71aa6515 100644
--- a/app/code/Magento/Backend/i18n/en_US.csv
+++ b/app/code/Magento/Backend/i18n/en_US.csv
@@ -404,11 +404,7 @@ Security,Security
 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 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 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 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.)."
 "Auto-redirect to Base URL","Auto-redirect to Base URL"
 "Search Engine Optimization","Search Engine Optimization"
 "Use Web Server Rewrites","Use Web Server Rewrites"

From 3658a1ba09b00111c7563471b23eb05fb2f75a9a Mon Sep 17 00:00:00 2001
From: Alok Patel <alok0590@users.noreply.github.com>
Date: Tue, 3 Mar 2020 15:21:27 +0530
Subject: [PATCH 005/120] Update AbstractResource.php

---
 .../Framework/Model/ResourceModel/AbstractResource.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/lib/internal/Magento/Framework/Model/ResourceModel/AbstractResource.php b/lib/internal/Magento/Framework/Model/ResourceModel/AbstractResource.php
index 255e6d94d741f..555a73577e6f6 100644
--- a/lib/internal/Magento/Framework/Model/ResourceModel/AbstractResource.php
+++ b/lib/internal/Magento/Framework/Model/ResourceModel/AbstractResource.php
@@ -92,12 +92,12 @@ public function commit()
          */
         if ($this->getConnection()->getTransactionLevel() === 0) {
             $callbacks = CallbackPool::get(spl_object_hash($this->getConnection()));
-            try {
-                foreach ($callbacks as $callback) {
-                    call_user_func($callback);
-                }
-            } catch (\Exception $e) {
+            foreach ($callbacks as $callback) {
+              try {
+                call_user_func($callback);
+              } catch (\Exception $e) {
                 $this->getLogger()->critical($e);
+              }
             }
         }
         return $this;

From 2ef402a91a88c098db11a1024940ada4c842d16e Mon Sep 17 00:00:00 2001
From: "vadim.malesh" <engcom-vendorworker-charlie@adobe.com>
Date: Mon, 16 Mar 2020 09:47:43 +0200
Subject: [PATCH 006/120] fix static, test coverage

---
 .../Model/ResourceModel/AbstractResource.php  |  12 +-
 .../ResourceModel/AbstractResourceTest.php    | 183 +++++++++++++-----
 2 files changed, 138 insertions(+), 57 deletions(-)

diff --git a/lib/internal/Magento/Framework/Model/ResourceModel/AbstractResource.php b/lib/internal/Magento/Framework/Model/ResourceModel/AbstractResource.php
index 555a73577e6f6..51a59df3383af 100644
--- a/lib/internal/Magento/Framework/Model/ResourceModel/AbstractResource.php
+++ b/lib/internal/Magento/Framework/Model/ResourceModel/AbstractResource.php
@@ -13,6 +13,7 @@
 /**
  * Abstract resource model
  *
+ * phpcs:disable Magento2.Classes.AbstractApi
  * @api
  */
 abstract class AbstractResource
@@ -93,13 +94,14 @@ public function commit()
         if ($this->getConnection()->getTransactionLevel() === 0) {
             $callbacks = CallbackPool::get(spl_object_hash($this->getConnection()));
             foreach ($callbacks as $callback) {
-              try {
-                call_user_func($callback);
-              } catch (\Exception $e) {
-                $this->getLogger()->critical($e);
-              }
+                try {
+                    call_user_func($callback);
+                } catch (\Exception $e) {
+                    $this->getLogger()->critical($e);
+                }
             }
         }
+
         return $this;
     }
 
diff --git a/lib/internal/Magento/Framework/Model/Test/Unit/ResourceModel/AbstractResourceTest.php b/lib/internal/Magento/Framework/Model/Test/Unit/ResourceModel/AbstractResourceTest.php
index 11917d4df1973..4f979f554d3ee 100644
--- a/lib/internal/Magento/Framework/Model/Test/Unit/ResourceModel/AbstractResourceTest.php
+++ b/lib/internal/Magento/Framework/Model/Test/Unit/ResourceModel/AbstractResourceTest.php
@@ -3,67 +3,83 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Framework\Model\Test\Unit\ResourceModel;
 
 use Magento\Framework\DataObject;
 use Magento\Framework\DB\Adapter\AdapterInterface;
-use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 use Magento\Framework\Serialize\Serializer\Json;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use PHPUnit\Framework\MockObject\MockObject as MockObject;
+use PHPUnit\Framework\TestCase;
+use Psr\Log\LoggerInterface;
 
-class AbstractResourceTest extends \PHPUnit\Framework\TestCase
+/**
+ * Test for \Magento\Framework\Model\ResourceModel\AbstractResource.
+ */
+class AbstractResourceTest extends TestCase
 {
     /**
      * @var AbstractResourceStub
      */
-    private $abstractResource;
+    private $model;
 
     /**
-     * @var Json|\PHPUnit_Framework_MockObject_MockObject
+     * @var Json|MockObject
      */
     private $serializerMock;
 
     /**
-     * @var \Psr\Log\LoggerInterface|\PHPUnit_Framework_MockObject_MockObject
+     * @var LoggerInterface|MockObject
      */
     private $loggerMock;
 
+    /**
+     * @inheritdoc
+     */
     protected function setUp()
     {
         $objectManager = new ObjectManager($this);
+        $this->model = $objectManager->getObject(AbstractResourceStub::class);
         $this->serializerMock = $this->createMock(Json::class);
-        $this->loggerMock = $this->createMock(\Psr\Log\LoggerInterface::class);
-        $this->abstractResource = $objectManager->getObject(AbstractResourceStub::class);
-        $objectManager->setBackwardCompatibleProperty($this->abstractResource, 'serializer', $this->serializerMock);
-        $objectManager->setBackwardCompatibleProperty($this->abstractResource, '_logger', $this->loggerMock);
+        $this->loggerMock = $this->createMock(LoggerInterface::class);
+        $objectManager->setBackwardCompatibleProperty($this->model, 'serializer', $this->serializerMock);
+        $objectManager->setBackwardCompatibleProperty($this->model, '_logger', $this->loggerMock);
     }
 
     /**
+     * Test fields serialize
+     *
      * @param array $arguments
-     * @param string $expected
+     * @param string|null $expected
      * @param array|string|int $serializeCalledWith
      * @param int $numSerializeCalled
+     * @return void
      * @dataProvider serializeFieldsDataProvider
      */
     public function testSerializeFields(
         array $arguments,
-        $expected,
+        ?string $expected,
         $serializeCalledWith,
-        $numSerializeCalled = 1
-    ) {
+        int $numSerializeCalled = 1
+    ): void {
         /** @var DataObject $dataObject */
-        list($dataObject, $field, $defaultValue, $unsetEmpty) = $arguments;
+        [$dataObject, $field, $defaultValue, $unsetEmpty] = $arguments;
         $this->serializerMock->expects($this->exactly($numSerializeCalled))
             ->method('serialize')
             ->with($serializeCalledWith)
             ->willReturn($expected);
-        $this->abstractResource->_serializeField($dataObject, $field, $defaultValue, $unsetEmpty);
+        $this->model->_serializeField($dataObject, $field, $defaultValue, $unsetEmpty);
         $this->assertEquals($expected, $dataObject->getData($field));
     }
 
     /**
+     * DataProvider for testSerializeFields()
+     *
      * @return array
      */
-    public function serializeFieldsDataProvider()
+    public function serializeFieldsDataProvider(): array
     {
         $array = ['a', 'b', 'c'];
         $string = 'i am string';
@@ -75,60 +91,66 @@ public function serializeFieldsDataProvider()
                 'string' => $string,
                 'integer' => $integer,
                 'empty' => $empty,
-                'empty_with_default' => ''
+                'empty_with_default' => '',
             ]
         );
+
         return [
             [
                 [$dataObject, 'array', null, false],
                 '["a","b","c"]',
-                $array
+                $array,
             ],
             [
                 [$dataObject, 'string', null, false],
                 '"i am string"',
-                $string
+                $string,
             ],
             [
                 [$dataObject, 'integer', null, false],
                 '969',
-                $integer
+                $integer,
             ],
             [
                 [$dataObject, 'empty', null, true],
                 null,
                 $empty,
-                0
+                0,
             ],
             [
                 [$dataObject, 'empty_with_default', 'default', false],
                 '"default"',
-                'default'
-            ]
+                'default',
+            ],
         ];
     }
 
     /**
+     * Test fields unserialize
+     *
      * @param array $arguments
      * @param array|string|int|boolean $expected
+     * @return void
      * @dataProvider unserializeFieldsDataProvider
      */
-    public function testUnserializeFields(array $arguments, $expected)
+    public function testUnserializeFields(array $arguments, $expected): void
     {
         /** @var DataObject $dataObject */
-        list($dataObject, $field, $defaultValue) = $arguments;
+        [$dataObject, $field, $defaultValue] = $arguments;
         $this->serializerMock->expects($this->once())
             ->method('unserialize')
             ->with($dataObject->getData($field))
             ->willReturn($expected);
-        $this->abstractResource->_unserializeField($dataObject, $field, $defaultValue);
+        $this->model->_unserializeField($dataObject, $field, $defaultValue);
         $this->assertEquals($expected, $dataObject->getData($field));
     }
 
     /**
+     * DataProvider for testUnserializeFields()
+     *
      * @return array
      */
-    public function unserializeFieldsDataProvider()
+    public function unserializeFieldsDataProvider(): array
     {
         $dataObject = new DataObject(
             [
@@ -137,54 +159,60 @@ public function unserializeFieldsDataProvider()
                 'integer' => '969',
                 'empty_with_default' => '""',
                 'not_serialized_string' => 'i am string',
-                'serialized_boolean_false' => 'false'
+                'serialized_boolean_false' => 'false',
             ]
         );
+
         return [
             [
                 [$dataObject, 'array', null],
-                ['a', 'b', 'c']
+                ['a', 'b', 'c'],
             ],
             [
                 [$dataObject, 'string', null],
-                'i am string'
+                'i am string',
             ],
             [
                 [$dataObject, 'integer', null],
-                969
+                969,
             ],
             [
                 [$dataObject, 'empty_with_default', 'default', false],
-                'default'
+                'default',
             ],
             [
                 [$dataObject, 'not_serialized_string', null],
-                'i am string'
+                'i am string',
             ],
             [
                 [$dataObject, 'serialized_boolean_false', null],
                 false,
-            ]
+            ],
         ];
     }
-    
-    public function testCommitZeroLevel()
+
+    /**
+     * Commit zero level
+     *
+     * @return void
+     */
+    public function testCommitZeroLevel(): void
     {
-        /** @var AdapterInterface|\PHPUnit_Framework_MockObject_MockObject $connection */
+        /** @var AdapterInterface|MockObject $connection */
         $connection = $this->createMock(AdapterInterface::class);
-        /** @var DataObject|\PHPUnit_Framework_MockObject_MockObject $closureExpectation */
+        /** @var DataObject|MockObject $closureExpectation */
         $closureExpectation = $this->getMockBuilder(DataObject::class)
             ->disableOriginalConstructor()
             ->getMock();
 
-        $this->abstractResource->setConnection($connection);
-        $this->abstractResource->addCommitCallback(
+        $this->model->setConnection($connection);
+        $this->model->addCommitCallback(
             function () use ($closureExpectation) {
                 $closureExpectation->setData(1);
             }
         );
 
-        $this->abstractResource->addCommitCallback(
+        $this->model->addCommitCallback(
             function () use ($closureExpectation) {
                 $closureExpectation->getData();
             }
@@ -201,16 +229,21 @@ function () use ($closureExpectation) {
         $closureExpectation->expects($this->once())
             ->method('getData');
 
-        $this->abstractResource->commit();
+        $this->model->commit();
     }
 
-    public function testCommitZeroLevelCallbackException()
+    /**
+     * Commit zero level callback with exception
+     *
+     * @return void
+     */
+    public function testCommitZeroLevelCallbackException(): void
     {
         /** @var AdapterInterface|\PHPUnit_Framework_MockObject_MockObject $connection */
         $connection = $this->createMock(AdapterInterface::class);
 
-        $this->abstractResource->setConnection($connection);
-        $this->abstractResource->addCommitCallback(
+        $this->model->setConnection($connection);
+        $this->model->addCommitCallback(
             function () {
                 throw new \Exception();
             }
@@ -224,20 +257,25 @@ function () {
         $this->loggerMock->expects($this->once())
             ->method('critical');
 
-        $this->abstractResource->commit();
+        $this->model->commit();
     }
 
-    public function testCommitNotCompletedTransaction()
+    /**
+     * Commit of transactions that have not been completed
+     *
+     * @return void
+     */
+    public function testCommitNotCompletedTransaction(): void
     {
-        /** @var AdapterInterface|\PHPUnit_Framework_MockObject_MockObject $connection */
+        /** @var AdapterInterface|MockObject $connection */
         $connection = $this->createMock(AdapterInterface::class);
-        /** @var DataObject|\PHPUnit_Framework_MockObject_MockObject $closureExpectation */
+        /** @var DataObject|MockObject $closureExpectation */
         $closureExpectation = $this->getMockBuilder(DataObject::class)
             ->disableOriginalConstructor()
             ->getMock();
 
-        $this->abstractResource->setConnection($connection);
-        $this->abstractResource->addCommitCallback(
+        $this->model->setConnection($connection);
+        $this->model->addCommitCallback(
             function () use ($closureExpectation) {
                 $closureExpectation->setData(1);
             }
@@ -253,6 +291,47 @@ function () use ($closureExpectation) {
             ->method('setData')
             ->with(1);
 
-        $this->abstractResource->commit();
+        $this->model->commit();
+    }
+
+    /**
+     * Test commit case when first callback throws an exception but other callbacks will be called
+     *
+     * @return void
+     */
+    public function testCommitFewCallbacksWithException(): void
+    {
+        /** @var AdapterInterface|MockObject $connection */
+        $connection = $this->createMock(AdapterInterface::class);
+
+        /** @var DataObject|MockObject $closureExpectation */
+        $closureExpectation = $this->getMockBuilder(DataObject::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->model->setConnection($connection);
+        $this->model->addCommitCallback(
+            function () {
+                throw new \Exception();
+            }
+        );
+
+        $this->model->addCommitCallback(
+            function () use ($closureExpectation) {
+                $closureExpectation->getData();
+            }
+        );
+
+        $connection->expects($this->once())
+            ->method('commit');
+        $connection->expects($this->once())
+            ->method('getTransactionLevel')
+            ->willReturn(0);
+        $this->loggerMock->expects($this->once())
+            ->method('critical');
+        $closureExpectation->expects($this->once())
+            ->method('getData');
+
+        $this->model->commit();
     }
 }

From 31eeaa7b5b18d27fc786660d23faaba6ff0393d1 Mon Sep 17 00:00:00 2001
From: Mateusz Krzeszowiak <mateusz.krzeszowiak@creativestyle.pl>
Date: Thu, 12 Mar 2020 20:16:06 +0100
Subject: [PATCH 007/120] Adjust mechanism that moves all scripts to the end of
 the page

---
 .../Controller/Result/JsFooterPlugin.php      | 45 +++++++++++--------
 1 file changed, 26 insertions(+), 19 deletions(-)

diff --git a/app/code/Magento/Theme/Controller/Result/JsFooterPlugin.php b/app/code/Magento/Theme/Controller/Result/JsFooterPlugin.php
index 6a80dec460660..9a68e28942056 100644
--- a/app/code/Magento/Theme/Controller/Result/JsFooterPlugin.php
+++ b/app/code/Magento/Theme/Controller/Result/JsFooterPlugin.php
@@ -40,25 +40,32 @@ public function __construct(ScopeConfigInterface $scopeConfig)
     public function beforeSendResponse(Http $subject)
     {
         $content = $subject->getContent();
-        $script = [];
-        if (is_string($content) && strpos($content, '</body') !== false) {
-            if ($this->scopeConfig->isSetFlag(
-                self::XML_PATH_DEV_MOVE_JS_TO_BOTTOM,
-                ScopeInterface::SCOPE_STORE
-            )
-            ) {
-                $pattern = '#<script[^>]*+(?<!text/x-magento-template.)>.*?</script>#is';
-                $content = preg_replace_callback(
-                    $pattern,
-                    function ($matchPart) use (&$script) {
-                        $script[] = $matchPart[0];
-                        return '';
-                    },
-                    $content
-                );
-                $subject->setContent(
-                    str_replace('</body', implode("\n", $script) . "\n</body", $content)
-                );
+
+        $bodyClose = '</body';
+
+        if (is_string($content) && strpos($content, $bodyClose) !== false && $this->scopeConfig->isSetFlag(
+            self::XML_PATH_DEV_MOVE_JS_TO_BOTTOM,
+            ScopeInterface::SCOPE_STORE
+        )) {
+            $scripts = '';
+
+            $scriptOpen = '<script';
+            $scriptClose = '</script>';
+
+            $scriptOpenPos = strpos($content, $scriptOpen);
+            while ($scriptOpenPos !== false) {
+                $scriptClosePos = strpos($content, $scriptClose, $scriptOpenPos);
+                $script = substr($content, $scriptOpenPos, $scriptClosePos - $scriptOpenPos + strlen($scriptClose));
+
+                $scripts .= "\n" . $script;
+                $content = str_replace($script, '', $content);
+                // Script cut out, continue search from its position.
+                $scriptOpenPos = strpos($content, $scriptOpen, $scriptOpenPos);
+            }
+
+            if ($scripts) {
+                $content = str_replace($bodyClose, $scripts . "\n" . $bodyClose, $content);
+                $subject->setContent($content);
             }
         }
     }

From 4fa54472bab13709e6f320fea97bdc94f330bcfd Mon Sep 17 00:00:00 2001
From: Mateusz Krzeszowiak <mateusz.krzeszowiak@creativestyle.pl>
Date: Wed, 18 Mar 2020 21:30:45 +0100
Subject: [PATCH 008/120] Don't move Magento templates, fix tests

---
 .../Magento/Theme/Controller/Result/JsFooterPlugin.php     | 7 ++++++-
 .../Test/Unit/Controller/Result/JsFooterPluginTest.php     | 6 +++---
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/app/code/Magento/Theme/Controller/Result/JsFooterPlugin.php b/app/code/Magento/Theme/Controller/Result/JsFooterPlugin.php
index 9a68e28942056..07c72f6692cc2 100644
--- a/app/code/Magento/Theme/Controller/Result/JsFooterPlugin.php
+++ b/app/code/Magento/Theme/Controller/Result/JsFooterPlugin.php
@@ -39,7 +39,7 @@ public function __construct(ScopeConfigInterface $scopeConfig)
      */
     public function beforeSendResponse(Http $subject)
     {
-        $content = $subject->getContent();
+        $content = $subject->getContent() ?? '';
 
         $bodyClose = '</body';
 
@@ -57,6 +57,11 @@ public function beforeSendResponse(Http $subject)
                 $scriptClosePos = strpos($content, $scriptClose, $scriptOpenPos);
                 $script = substr($content, $scriptOpenPos, $scriptClosePos - $scriptOpenPos + strlen($scriptClose));
 
+                if (strpos($script, 'text/x-magento-template') !== false) {
+                    $scriptOpenPos = strpos($content, $scriptOpen, $scriptClosePos);
+                    continue;
+                }
+
                 $scripts .= "\n" . $script;
                 $content = str_replace($script, '', $content);
                 // Script cut out, continue search from its position.
diff --git a/app/code/Magento/Theme/Test/Unit/Controller/Result/JsFooterPluginTest.php b/app/code/Magento/Theme/Test/Unit/Controller/Result/JsFooterPluginTest.php
index 8b696251d4e73..f3ae9391bbde1 100644
--- a/app/code/Magento/Theme/Test/Unit/Controller/Result/JsFooterPluginTest.php
+++ b/app/code/Magento/Theme/Test/Unit/Controller/Result/JsFooterPluginTest.php
@@ -74,9 +74,9 @@ public function sendResponseDataProvider(): array
                 "flag" => true,
                 "result" => "<body><h1>Test Title</h1>" .
                     "<script type=\"text/x-magento-template\">test</script>" .
-                    "<p>Test Content</p>" .
-                    "<script type=\"text/x-magento-init\">test</script>" .
-                    "\n</body>"
+                    "<p>Test Content</p>\n" .
+                    "<script type=\"text/x-magento-init\">test</script>\n" .
+                    "</body>"
             ],
             'content_with_config_disable' => [
                 "content" => "<body><p>Test Content</p></body>",

From 0e964e496c0d83ab20974da51f2d21ba2680043e Mon Sep 17 00:00:00 2001
From: Rohan Hapani <rohan.hapani@magedelight.com>
Date: Fri, 20 Mar 2020 14:49:05 +0530
Subject: [PATCH 009/120] Solution : Advance search page allow minus price
 filter

---
 .../CatalogSearch/view/frontend/templates/advanced/form.phtml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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..26420705c7ffd 100644
--- a/app/code/Magento/CatalogSearch/view/frontend/templates/advanced/form.phtml
+++ b/app/code/Magento/CatalogSearch/view/frontend/templates/advanced/form.phtml
@@ -68,7 +68,7 @@
                                    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, 'validate-not-negative-number':true, 'less-than-equals-to':'#<?= $block->escapeHtmlAttr($_code) ?>_to'}" />
                         </div>
                     </div>
                     <div class="field with-addon no-label">
@@ -81,7 +81,7 @@
                                        class="input-text"
                                        type="text"
                                        maxlength="<?= $block->escapeHtmlAttr($maxQueryLength) ?>"
-                                       data-validate="{number:true, 'greater-than-equals-to':'#<?= $block->escapeHtmlAttr($_code) ?>'}" />
+                                       data-validate="{number:true, 'validate-not-negative-number':true, 'greater-than-equals-to':'#<?= $block->escapeHtmlAttr($_code) ?>'}" />
                                 <label class="addafter"
                                        for="<?= $block->escapeHtmlAttr($_code) ?>_to">
                                     <?= $block->escapeHtml($block->getCurrency($_attribute)) ?>

From d0ab2a328666825dc1f87f333638255268a24026 Mon Sep 17 00:00:00 2001
From: dzung kiu <dzung.kiu@balanceinternet.com.au>
Date: Wed, 25 Mar 2020 18:00:27 +0700
Subject: [PATCH 010/120] #23440 fix Refund for bundle product without
 receiving product back error

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

diff --git a/app/code/Magento/Sales/Model/Order/CreditmemoFactory.php b/app/code/Magento/Sales/Model/Order/CreditmemoFactory.php
index 73afd0a06f710..cc2a645413fdf 100644
--- a/app/code/Magento/Sales/Model/Order/CreditmemoFactory.php
+++ b/app/code/Magento/Sales/Model/Order/CreditmemoFactory.php
@@ -147,7 +147,7 @@ protected function canRefundItem($item, $qtys = [], $invoiceQtysRefundLimits = [
         if ($item->isDummy()) {
             if ($item->getHasChildren()) {
                 foreach ($item->getChildrenItems() as $child) {
-                    if (empty($qtys)) {
+                    if (empty($qtys) || (count(array_unique($qtys)) === 1 && end($qtys) == 0)) {
                         if ($this->canRefundNoDummyItem($child, $invoiceQtysRefundLimits)) {
                             return true;
                         }

From 1767ab8c7d25f0d5bba3e09923b4dd7bb7ac3c9d Mon Sep 17 00:00:00 2001
From: Dmytro Horytskyi <dhorytskyi@magento.com>
Date: Tue, 31 Mar 2020 21:21:54 -0500
Subject: [PATCH 011/120] MC-32929: Site is down when Redis uses all allowed
 memory

---
 .../Magento/Framework/Cache/Backend/Redis.php | 20 ++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

diff --git a/lib/internal/Magento/Framework/Cache/Backend/Redis.php b/lib/internal/Magento/Framework/Cache/Backend/Redis.php
index ed97cb9f50c3b..565777d68ff63 100644
--- a/lib/internal/Magento/Framework/Cache/Backend/Redis.php
+++ b/lib/internal/Magento/Framework/Cache/Backend/Redis.php
@@ -73,11 +73,25 @@ public function load($id, $doNotTestCacheValidity = false)
     public function save($data, $id, $tags = [], $specificLifetime = false)
     {
         try {
-            parent::save($data, $id, $tags, $specificLifetime);
+            $result = parent::save($data, $id, $tags, $specificLifetime);
         } catch (\Throwable $exception) {
-            return false;
+            $result = false;
         }
 
-        return true;
+        return $result;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function remove($id)
+    {
+        try {
+            $result = parent::remove($id);
+        } catch (\Throwable $exception) {
+            $result = false;
+        }
+
+        return $result;
     }
 }

From cb03de47d595ffe38f87aa209b43ebea748efd16 Mon Sep 17 00:00:00 2001
From: Yogesh Suhagiya <783102+yogeshsuhagiya@users.noreply.github.com>
Date: Wed, 1 Apr 2020 11:19:12 +0530
Subject: [PATCH 012/120] Added missing translation strings to the file.

---
 app/code/Magento/Backend/i18n/en_US.csv | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/code/Magento/Backend/i18n/en_US.csv b/app/code/Magento/Backend/i18n/en_US.csv
index eaf4cef39d0cf..b520df3a2a0f7 100644
--- a/app/code/Magento/Backend/i18n/en_US.csv
+++ b/app/code/Magento/Backend/i18n/en_US.csv
@@ -405,6 +405,8 @@ 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 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.)."
+"Enable Frontend Resize","Enable Frontend Resize"
+"Resize performed via javascript before file upload.","Resize performed via javascript before file upload."
 "Auto-redirect to Base URL","Auto-redirect to Base URL"
 "Search Engine Optimization","Search Engine Optimization"
 "Use Web Server Rewrites","Use Web Server Rewrites"

From 9c8143329ca5d22d7fc7b29f329f6f49467752ca Mon Sep 17 00:00:00 2001
From: Tu Nguyen <ladiesman9x@gmail.com>
Date: Sat, 4 Apr 2020 18:31:36 +0700
Subject: [PATCH 013/120] Fix issue widget recent view product not fit in
 mobile

---
 .../web/css/source/_widgets.less              | 74 ++++++++++++-------
 1 file changed, 49 insertions(+), 25 deletions(-)

diff --git a/app/design/frontend/Magento/blank/Magento_Catalog/web/css/source/_widgets.less b/app/design/frontend/Magento/blank/Magento_Catalog/web/css/source/_widgets.less
index 7181606090ccb..09896fb21d71c 100644
--- a/app/design/frontend/Magento/blank/Magento_Catalog/web/css/source/_widgets.less
+++ b/app/design/frontend/Magento/blank/Magento_Catalog/web/css/source/_widgets.less
@@ -25,7 +25,7 @@
     .block.widget {
         .products-grid .product-item {
             margin-left: 2%;
-            width: calc(~'(100% - 2%)/2');
+            width: calc(~'(100% - 2%) / 2');
 
             &:nth-child(2n + 1) {
                 margin-left: 0;
@@ -63,19 +63,45 @@
 //  Mobile
 //  _____________________________________________
 
-.media-width(@extremum, @break) when (@extremum = 'min') and (@break = @screen__s) {
+.media-width(@extremum, @break) when (@extremum = 'max') and (@break = @screen__m) {
     .block.widget .products-grid .product-item,
     .page-layout-1column .block.widget .products-grid .product-item,
     .page-layout-3columns .block.widget .products-grid .product-item {
         width: 100%/3;
     }
 
-    .page-layout-1column .block.widget .products-grid .product-item {
-        margin-left: 2%;
-        width: calc(~'(100% - 4%)/3');
+    .sidebar .block-viewed-products-grid {
+        .products-grid {
+            .product-item {
+                margin-left: 2%;
+                width: calc(~'(100% - 2%) / 2');
 
-        &:nth-child(3n + 1) {
-            margin-left: 0;
+                &:nth-child(2n + 1) {
+                    margin-left: 0;
+                }
+            }
+
+            .product-item-photo {
+                display: block;
+                position: relative;
+            }
+
+            .product-item-details {
+                margin: 0;
+            }
+
+            .product-item-info {
+                width: auto;
+                text-align: center;
+
+                .product-item-actions {
+                    display: inline-block;
+                }
+            }
+
+            .product-item-description {
+                margin: 10px 0;
+            }
         }
     }
 }
@@ -101,7 +127,7 @@
 
     .page-layout-1column .block.widget .products-grid .product-item {
         margin-left: 2%;
-        width: calc(~'(100% - 6%)/4');
+        width: calc(~'(100% - 6%) / 4');
 
         &:nth-child(3n + 1) {
             margin-left: 2%;
@@ -115,6 +141,20 @@
     .page-layout-3columns .block.widget .products-grid .product-item {
         width: 100%/2;
     }
+
+    .sidebar .block.widget .pager {
+        .item:not(.pages-item-next):not(.pages-item-previous) {
+            &:extend(.abs-no-display-desktop all);
+        }
+
+        .pages-item-next {
+            padding: 0;
+
+            .action {
+                margin: 0;
+            }
+        }
+    }
 }
 
 .media-width(@extremum, @break) when (@extremum = 'min') and (@break = @screen__l) {
@@ -124,7 +164,7 @@
 
     .page-layout-1column .block.widget .products-grid .product-item {
         margin-left: 2%;
-        width: calc(~'(100% - 8%)/5');
+        width: calc(~'(100% - 8%) / 5');
 
         &:nth-child(4n + 1) {
             margin-left: 2%;
@@ -153,19 +193,3 @@
         }
     }
 }
-
-.media-width(@extremum, @break) when (@extremum = 'min') and (@break = @screen__m) {
-    .sidebar .block.widget .pager {
-        .item:not(.pages-item-next):not(.pages-item-previous) {
-            &:extend(.abs-no-display-desktop all);
-        }
-
-        .pages-item-next {
-            padding: 0;
-
-            .action {
-                margin: 0;
-            }
-        }
-    }
-}

From 4b64f33e755ca94363f01528c7b6fe01e41b9d67 Mon Sep 17 00:00:00 2001
From: Tu Nguyen <ladiesman9x@gmail.com>
Date: Sat, 4 Apr 2020 18:53:47 +0700
Subject: [PATCH 014/120] Update styles

---
 .../blank/Magento_Catalog/web/css/source/_widgets.less   | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/app/design/frontend/Magento/blank/Magento_Catalog/web/css/source/_widgets.less b/app/design/frontend/Magento/blank/Magento_Catalog/web/css/source/_widgets.less
index 09896fb21d71c..c6aaf3f5ac4fb 100644
--- a/app/design/frontend/Magento/blank/Magento_Catalog/web/css/source/_widgets.less
+++ b/app/design/frontend/Magento/blank/Magento_Catalog/web/css/source/_widgets.less
@@ -111,6 +111,15 @@
 //  _____________________________________________
 
 .media-width(@extremum, @break) when (@extremum = 'min') and (@break = @screen__m) {
+    .page-layout-1column .block.widget .products-grid .product-item {
+        margin-left: 2%;
+        width: calc(~'(100% - 4%)/3');
+
+        &:nth-child(3n + 1) {
+            margin-left: 0;
+        }
+    }
+
     .block.widget .products-grid .product-item {
         width: 100%/3;
 

From 5f0c02b8294b4cc779edee8041b9e4ff841bdfca Mon Sep 17 00:00:00 2001
From: Tu Nguyen <ladiesman9x@gmail.com>
Date: Sat, 4 Apr 2020 18:56:20 +0700
Subject: [PATCH 015/120] Update styles #2

---
 .../Magento_Catalog/web/css/source/_widgets.less     | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/design/frontend/Magento/blank/Magento_Catalog/web/css/source/_widgets.less b/app/design/frontend/Magento/blank/Magento_Catalog/web/css/source/_widgets.less
index c6aaf3f5ac4fb..72c7a72d5d918 100644
--- a/app/design/frontend/Magento/blank/Magento_Catalog/web/css/source/_widgets.less
+++ b/app/design/frontend/Magento/blank/Magento_Catalog/web/css/source/_widgets.less
@@ -64,12 +64,6 @@
 //  _____________________________________________
 
 .media-width(@extremum, @break) when (@extremum = 'max') and (@break = @screen__m) {
-    .block.widget .products-grid .product-item,
-    .page-layout-1column .block.widget .products-grid .product-item,
-    .page-layout-3columns .block.widget .products-grid .product-item {
-        width: 100%/3;
-    }
-
     .sidebar .block-viewed-products-grid {
         .products-grid {
             .product-item {
@@ -111,6 +105,12 @@
 //  _____________________________________________
 
 .media-width(@extremum, @break) when (@extremum = 'min') and (@break = @screen__m) {
+    .block.widget .products-grid .product-item,
+    .page-layout-1column .block.widget .products-grid .product-item,
+    .page-layout-3columns .block.widget .products-grid .product-item {
+        width: 100%/3;
+    }
+
     .page-layout-1column .block.widget .products-grid .product-item {
         margin-left: 2%;
         width: calc(~'(100% - 4%)/3');

From 581ab1f9c6fc6d47985670c9da89a567d7fc01a7 Mon Sep 17 00:00:00 2001
From: Tu Nguyen <ladiesman9x@gmail.com>
Date: Sat, 4 Apr 2020 20:49:34 +0700
Subject: [PATCH 016/120] Fix less code styles

---
 .../blank/Magento_Catalog/web/css/source/_widgets.less | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/design/frontend/Magento/blank/Magento_Catalog/web/css/source/_widgets.less b/app/design/frontend/Magento/blank/Magento_Catalog/web/css/source/_widgets.less
index 72c7a72d5d918..1336c306f6cd5 100644
--- a/app/design/frontend/Magento/blank/Magento_Catalog/web/css/source/_widgets.less
+++ b/app/design/frontend/Magento/blank/Magento_Catalog/web/css/source/_widgets.less
@@ -85,12 +85,12 @@
             }
 
             .product-item-info {
-                width: auto;
                 text-align: center;
+                width: auto;
+            }
 
-                .product-item-actions {
-                    display: inline-block;
-                }
+            .product-item-actions {
+                display: inline-block;
             }
 
             .product-item-description {
@@ -113,7 +113,7 @@
 
     .page-layout-1column .block.widget .products-grid .product-item {
         margin-left: 2%;
-        width: calc(~'(100% - 4%)/3');
+        width: calc(~'(100% - 4%) / 3');
 
         &:nth-child(3n + 1) {
             margin-left: 0;

From a4935e30f2b83aeb0abe20c666a879f86c7a3728 Mon Sep 17 00:00:00 2001
From: Tu Nguyen <ladiesman9x@gmail.com>
Date: Sun, 5 Apr 2020 14:04:16 +0700
Subject: [PATCH 017/120] Update file

---
 .../web/css/source/_widgets.less              | 21 +++++++------------
 1 file changed, 7 insertions(+), 14 deletions(-)

diff --git a/app/design/frontend/Magento/blank/Magento_Catalog/web/css/source/_widgets.less b/app/design/frontend/Magento/blank/Magento_Catalog/web/css/source/_widgets.less
index 1336c306f6cd5..6da9a31caf5f0 100644
--- a/app/design/frontend/Magento/blank/Magento_Catalog/web/css/source/_widgets.less
+++ b/app/design/frontend/Magento/blank/Magento_Catalog/web/css/source/_widgets.less
@@ -86,25 +86,12 @@
 
             .product-item-info {
                 text-align: center;
-                width: auto;
-            }
-
-            .product-item-actions {
-                display: inline-block;
-            }
-
-            .product-item-description {
-                margin: 10px 0;
             }
         }
     }
 }
 
-//
-//  Desktop
-//  _____________________________________________
-
-.media-width(@extremum, @break) when (@extremum = 'min') and (@break = @screen__m) {
+.media-width(@extremum, @break) when (@extremum = 'min') and (@break = @screen__s) {
     .block.widget .products-grid .product-item,
     .page-layout-1column .block.widget .products-grid .product-item,
     .page-layout-3columns .block.widget .products-grid .product-item {
@@ -119,7 +106,13 @@
             margin-left: 0;
         }
     }
+}
 
+//
+//  Desktop
+//  _____________________________________________
+
+.media-width(@extremum, @break) when (@extremum = 'min') and (@break = @screen__m) {
     .block.widget .products-grid .product-item {
         width: 100%/3;
 

From 32926385fcce5e72c028174d105c1a8fad785bd5 Mon Sep 17 00:00:00 2001
From: Mateusz Krzeszowiak <mateusz.krzeszowiak@creativestyle.pl>
Date: Sun, 5 Apr 2020 11:24:22 +0200
Subject: [PATCH 018/120] Prevent leaking of variables to global scope

---
 .../Magento/Framework/RequireJs/Config.php    | 26 +++++++++--------
 .../RequireJs/Test/Unit/ConfigTest.php        | 29 ++++++++++---------
 2 files changed, 29 insertions(+), 26 deletions(-)

diff --git a/lib/internal/Magento/Framework/RequireJs/Config.php b/lib/internal/Magento/Framework/RequireJs/Config.php
index 67fdd00b3d919..6d3da369a8061 100644
--- a/lib/internal/Magento/Framework/RequireJs/Config.php
+++ b/lib/internal/Magento/Framework/RequireJs/Config.php
@@ -293,24 +293,26 @@ protected function getConfigFileName()
      */
     public function getMinResolverCode()
     {
-        $excludes = ['url.indexOf(baseUrl) === 0'];
+        $excludes = ['url.indexOf(baseUrl)===0'];
         foreach ($this->minification->getExcludes('js') as $expression) {
             $excludes[] = '!url.match(/' . str_replace('/', '\/', $expression) . '/)';
         }
         $excludesCode = empty($excludes) ? 'true' : implode('&&', $excludes);
 
         $result = <<<code
-    var ctx = require.s.contexts._,
-        origNameToUrl = ctx.nameToUrl,
-        baseUrl = ctx.config.baseUrl;
-
-    ctx.nameToUrl = function() {
-        var url = origNameToUrl.apply(ctx, arguments);
-        if ({$excludesCode}) {
-            url = url.replace(/(\.min)?\.js$/, '.min.js');
-        }
-        return url;
-    };
+    (function () {
+        var ctx = require.s.contexts._,
+            origNameToUrl = ctx.nameToUrl,
+            baseUrl = ctx.config.baseUrl;
+
+        ctx.nameToUrl = function() {
+            var url = origNameToUrl.apply(ctx, arguments);
+            if ({$excludesCode}) {
+                url = url.replace(/(\.min)?\.js$/, '.min.js');
+            }
+            return url;
+        };
+    })();
 
 code;
 
diff --git a/lib/internal/Magento/Framework/RequireJs/Test/Unit/ConfigTest.php b/lib/internal/Magento/Framework/RequireJs/Test/Unit/ConfigTest.php
index b6b8203bef2bc..7b0e10977d749 100644
--- a/lib/internal/Magento/Framework/RequireJs/Test/Unit/ConfigTest.php
+++ b/lib/internal/Magento/Framework/RequireJs/Test/Unit/ConfigTest.php
@@ -137,7 +137,7 @@ function ($file) {
             ->willReturn(true);
 
         $expected = <<<expected
-(function(require){
+(function(){
 (function() {
 file_one.js content
 require.config(config);
@@ -149,7 +149,7 @@ function ($file) {
 
 
 
-})(require);
+})();
 expected;
 
         $this->minifyAdapterMock
@@ -180,18 +180,19 @@ public function testGetMinResolverCode()
             ->willReturnArgument(0);
 
         $expected = <<<code
-    var ctx = require.s.contexts._,
-        origNameToUrl = ctx.nameToUrl,
-        baseUrl = ctx.config.baseUrl;
-
-    ctx.nameToUrl = function() {
-        var url = origNameToUrl.apply(ctx, arguments);
-        if (url.indexOf(baseUrl) === 0&&!url.match(/\.min\./)) {
-            url = url.replace(/(\.min)?\.js$/, '.min.js');
-        }
-        return url;
-    };
-
+    (function () {
+        var ctx = require.s.contexts._,
+            origNameToUrl = ctx.nameToUrl,
+            baseUrl = ctx.config.baseUrl;
+
+        ctx.nameToUrl = function() {
+            var url = origNameToUrl.apply(ctx, arguments);
+            if (url.indexOf(baseUrl)===0&&!url.match(/\.min\./)) {
+                url = url.replace(/(\.min)?\.js$/, '.min.js');
+            }
+            return url;
+        };
+    })();
 code;
         $this->assertEquals($expected, $this->object->getMinResolverCode());
     }

From 633b31337e91ff6048f464e1ba0758d7919e09eb Mon Sep 17 00:00:00 2001
From: engcom-Echo <engcom-vendorworker-echo@adobe.com>
Date: Mon, 6 Apr 2020 16:16:11 +0300
Subject: [PATCH 019/120] Coverage mftf test

---
 ...SearchNegativeForPriceFieldActionGroup.xml | 24 +++++++++++++++++++
 ...thHintsData.xml => MessageAndHintData.xml} |  3 +++
 ...efrontCatalogSearchAdvancedFormSection.xml |  2 ++
 ...bleAdvancedSearchWithNegativePriceTest.xml | 24 +++++++++++++++++++
 4 files changed, 53 insertions(+)
 create mode 100644 app/code/Magento/CatalogSearch/Test/Mftf/ActionGroup/StorefrontAssertUnableSearchNegativeForPriceFieldActionGroup.xml
 rename app/code/Magento/CatalogSearch/Test/Mftf/Data/{MinMaxQueryLengthHintsData.xml => MessageAndHintData.xml} (76%)
 create mode 100644 app/code/Magento/CatalogSearch/Test/Mftf/Test/StorefrontCheckUnableAdvancedSearchWithNegativePriceTest.xml

diff --git a/app/code/Magento/CatalogSearch/Test/Mftf/ActionGroup/StorefrontAssertUnableSearchNegativeForPriceFieldActionGroup.xml b/app/code/Magento/CatalogSearch/Test/Mftf/ActionGroup/StorefrontAssertUnableSearchNegativeForPriceFieldActionGroup.xml
new file mode 100644
index 0000000000000..003cd0a0806e7
--- /dev/null
+++ b/app/code/Magento/CatalogSearch/Test/Mftf/ActionGroup/StorefrontAssertUnableSearchNegativeForPriceFieldActionGroup.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="StorefrontAssertUnableSearchNegativeForPriceFieldActionGroup" extends="StorefrontFillFormAdvancedSearchActionGroup">
+        <remove keyForRemoval="waitForPageLoad" />
+        <grabTextFrom selector="{{StorefrontCatalogSearchAdvancedFormSection.PriceFromError}}" stepKey="grabPriceFromError"/>
+        <grabTextFrom selector="{{StorefrontCatalogSearchAdvancedFormSection.PriceToError}}" stepKey="grabPriceToError"/>
+        <assertEquals stepKey="assertErrorMessagePriceFrom">
+            <actualResult type="string">{{UnableNegativePrice.Error_message}}</actualResult>
+            <expectedResult type="string">$grabPriceFromError</expectedResult>
+        </assertEquals>
+        <assertEquals stepKey="assertErrorMessagePriceTo">
+            <actualResult type="string">{{UnableNegativePrice.Error_message}}</actualResult>
+            <expectedResult type="string">$grabPriceToError</expectedResult>
+        </assertEquals>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/CatalogSearch/Test/Mftf/Data/MinMaxQueryLengthHintsData.xml b/app/code/Magento/CatalogSearch/Test/Mftf/Data/MessageAndHintData.xml
similarity index 76%
rename from app/code/Magento/CatalogSearch/Test/Mftf/Data/MinMaxQueryLengthHintsData.xml
rename to app/code/Magento/CatalogSearch/Test/Mftf/Data/MessageAndHintData.xml
index 6fb254afea347..98ef8de72b633 100644
--- a/app/code/Magento/CatalogSearch/Test/Mftf/Data/MinMaxQueryLengthHintsData.xml
+++ b/app/code/Magento/CatalogSearch/Test/Mftf/Data/MessageAndHintData.xml
@@ -11,4 +11,7 @@
     <entity name="MinMaxQueryLength" type="constant">
         <data key="Hint">This value must be compatible with the corresponding setting in the configured search engine</data>
     </entity>
+    <entity name="UnableNegativePrice" type="constant">
+        <data key="Error_message">Please enter a number 0 or greater in this field.</data>
+    </entity>
 </entities>
diff --git a/app/code/Magento/CatalogSearch/Test/Mftf/Section/StorefrontCatalogSearchAdvancedFormSection.xml b/app/code/Magento/CatalogSearch/Test/Mftf/Section/StorefrontCatalogSearchAdvancedFormSection.xml
index 6889025530098..540243abc6ad1 100644
--- a/app/code/Magento/CatalogSearch/Test/Mftf/Section/StorefrontCatalogSearchAdvancedFormSection.xml
+++ b/app/code/Magento/CatalogSearch/Test/Mftf/Section/StorefrontCatalogSearchAdvancedFormSection.xml
@@ -16,6 +16,8 @@
         <element name="ShortDescription" type="input" selector="#short_description"/>
         <element name="PriceFrom" type="input" selector="#price"/>
         <element name="PriceTo" type="input" selector="#price_to"/>
+        <element name="PriceFromError" type="text" selector="#price-error"/>
+        <element name="PriceToError" type="text" selector="#price_to-error"/>
         <element name="AttributeByCode" type="input" selector="#{{var1}}" parameterized="true"/>
         <element name="SubmitButton" type="button" selector="//*[@id='form-validate']//button[@type='submit']"/>
     </section>
diff --git a/app/code/Magento/CatalogSearch/Test/Mftf/Test/StorefrontCheckUnableAdvancedSearchWithNegativePriceTest.xml b/app/code/Magento/CatalogSearch/Test/Mftf/Test/StorefrontCheckUnableAdvancedSearchWithNegativePriceTest.xml
new file mode 100644
index 0000000000000..67e9fdd43f5fe
--- /dev/null
+++ b/app/code/Magento/CatalogSearch/Test/Mftf/Test/StorefrontCheckUnableAdvancedSearchWithNegativePriceTest.xml
@@ -0,0 +1,24 @@
+<?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="StorefrontCheckUnableAdvancedSearchWithNegativePriceTest">
+        <annotations>
+            <stories value="Use Advanced Search"/>
+            <title value="Unable negative price use to advanced search"/>
+            <description value="Check unable negative price use to advanced search by price from and price to"/>
+        </annotations>
+        <actionGroup ref="StorefrontOpenHomePageActionGroup" stepKey="goToStorefront"/>
+        <actionGroup ref="StorefrontOpenAdvancedSearchActionGroup" stepKey="openAdvancedSearch"/>
+        <actionGroup ref="StorefrontAssertUnableSearchNegativeForPriceFieldActionGroup" stepKey="assertUnableSearch">
+            <argument name="price_to" value="-50"/>
+            <argument name="price_from" value="-10"/>
+        </actionGroup>
+    </test>
+</tests>

From d03d1338b7b05da2faccc5b4dd2ec775bc0c8161 Mon Sep 17 00:00:00 2001
From: dzung kiu <dzung.kiu@balanceinternet.com.au>
Date: Tue, 7 Apr 2020 15:24:05 +0700
Subject: [PATCH 020/120] #23440 fix static test error

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

diff --git a/app/code/Magento/Sales/Model/Order/CreditmemoFactory.php b/app/code/Magento/Sales/Model/Order/CreditmemoFactory.php
index cc2a645413fdf..103ed3e2fa3c5 100644
--- a/app/code/Magento/Sales/Model/Order/CreditmemoFactory.php
+++ b/app/code/Magento/Sales/Model/Order/CreditmemoFactory.php
@@ -166,6 +166,7 @@ protected function canRefundItem($item, $qtys = [], $invoiceQtysRefundLimits = [
                     return isset($qtys[$parent->getId()]) && $qtys[$parent->getId()] > 0;
                 }
             }
+            return false;
         } else {
             return $this->canRefundNoDummyItem($item, $invoiceQtysRefundLimits);
         }

From a1f37fb9b8656acb35a4d5057eb03110f4c65452 Mon Sep 17 00:00:00 2001
From: engcom-Echo <engcom-vendorworker-echo@adobe.com>
Date: Tue, 7 Apr 2020 14:22:29 +0300
Subject: [PATCH 021/120] Static test fix

---
 .../CatalogSearch/view/frontend/templates/advanced/form.phtml    | 1 +
 1 file changed, 1 insertion(+)

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 26420705c7ffd..f158cebf41aae 100644
--- a/app/code/Magento/CatalogSearch/view/frontend/templates/advanced/form.phtml
+++ b/app/code/Magento/CatalogSearch/view/frontend/templates/advanced/form.phtml
@@ -5,6 +5,7 @@
  */
 
 // phpcs:disable Magento2.Templates.ThisInTemplate.FoundThis
+// @codingStandardsIgnoreFile
 ?>
 <?php
 /**

From 8437ec57b5c13ac0753048d9cc1ff8530170ee94 Mon Sep 17 00:00:00 2001
From: Tu Nguyen <ladiesman9x@gmail.com>
Date: Tue, 7 Apr 2020 21:01:44 +0700
Subject: [PATCH 022/120] Remove duplicate property checkbox ui grid style

---
 .../backend/Magento_Ui/web/css/source/module/_data-grid.less     | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/design/adminhtml/Magento/backend/Magento_Ui/web/css/source/module/_data-grid.less b/app/design/adminhtml/Magento/backend/Magento_Ui/web/css/source/module/_data-grid.less
index b0c44e127a454..bace69f79282e 100644
--- a/app/design/adminhtml/Magento/backend/Magento_Ui/web/css/source/module/_data-grid.less
+++ b/app/design/adminhtml/Magento/backend/Magento_Ui/web/css/source/module/_data-grid.less
@@ -392,7 +392,6 @@ body._in-resize {
         overflow: hidden;
         padding: 0;
         vertical-align: top;
-        vertical-align: middle;
         width: @control-checkbox-radio__size + @data-grid-checkbox-cell-inner__padding-horizontal * 2;
 
         &:hover {

From 08f2bd4b92603363d8cd5f2ca4ffbbbdd454b6e9 Mon Sep 17 00:00:00 2001
From: Mateusz Krzeszowiak <mateusz.krzeszowiak@creativestyle.pl>
Date: Wed, 8 Apr 2020 19:17:49 +0200
Subject: [PATCH 023/120] Adjust code after review

---
 .../Magento/Theme/Controller/Result/JsFooterPlugin.php     | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/app/code/Magento/Theme/Controller/Result/JsFooterPlugin.php b/app/code/Magento/Theme/Controller/Result/JsFooterPlugin.php
index 07c72f6692cc2..c8716ae7e08fa 100644
--- a/app/code/Magento/Theme/Controller/Result/JsFooterPlugin.php
+++ b/app/code/Magento/Theme/Controller/Result/JsFooterPlugin.php
@@ -39,20 +39,19 @@ public function __construct(ScopeConfigInterface $scopeConfig)
      */
     public function beforeSendResponse(Http $subject)
     {
-        $content = $subject->getContent() ?? '';
+        $content = (string)$subject->getContent();
 
         $bodyClose = '</body';
 
-        if (is_string($content) && strpos($content, $bodyClose) !== false && $this->scopeConfig->isSetFlag(
+        if (strpos($content, $bodyClose) !== false && $this->scopeConfig->isSetFlag(
             self::XML_PATH_DEV_MOVE_JS_TO_BOTTOM,
             ScopeInterface::SCOPE_STORE
         )) {
             $scripts = '';
-
             $scriptOpen = '<script';
             $scriptClose = '</script>';
-
             $scriptOpenPos = strpos($content, $scriptOpen);
+
             while ($scriptOpenPos !== false) {
                 $scriptClosePos = strpos($content, $scriptClose, $scriptOpenPos);
                 $script = substr($content, $scriptOpenPos, $scriptClosePos - $scriptOpenPos + strlen($scriptClose));

From 503b89ab64f8fcc2ff61fb92c0d40596deeac5ed Mon Sep 17 00:00:00 2001
From: Mateusz Krzeszowiak <mateusz.krzeszowiak@creativestyle.pl>
Date: Wed, 8 Apr 2020 19:59:25 +0200
Subject: [PATCH 024/120] Fix tests

---
 .../Magento/Framework/RequireJs/Test/Unit/ConfigTest.php      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/internal/Magento/Framework/RequireJs/Test/Unit/ConfigTest.php b/lib/internal/Magento/Framework/RequireJs/Test/Unit/ConfigTest.php
index 7b0e10977d749..5288625981169 100644
--- a/lib/internal/Magento/Framework/RequireJs/Test/Unit/ConfigTest.php
+++ b/lib/internal/Magento/Framework/RequireJs/Test/Unit/ConfigTest.php
@@ -137,7 +137,7 @@ function ($file) {
             ->willReturn(true);
 
         $expected = <<<expected
-(function(){
+(function(require){
 (function() {
 file_one.js content
 require.config(config);
@@ -149,7 +149,7 @@ function ($file) {
 
 
 
-})();
+})(require);
 expected;
 
         $this->minifyAdapterMock

From ab550b0ef7990700d3a0cdfbcd4a1cffc8931a6b Mon Sep 17 00:00:00 2001
From: Mateusz Krzeszowiak <mateusz.krzeszowiak@creativestyle.pl>
Date: Wed, 8 Apr 2020 20:57:18 +0200
Subject: [PATCH 025/120] Fix unit tests

---
 lib/internal/Magento/Framework/RequireJs/Config.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/lib/internal/Magento/Framework/RequireJs/Config.php b/lib/internal/Magento/Framework/RequireJs/Config.php
index 6d3da369a8061..6ae92a4a161bb 100644
--- a/lib/internal/Magento/Framework/RequireJs/Config.php
+++ b/lib/internal/Magento/Framework/RequireJs/Config.php
@@ -313,7 +313,6 @@ public function getMinResolverCode()
             return url;
         };
     })();
-
 code;
 
         if ($this->minification->isEnabled('js')) {

From 285c464b4328c82c50eb1c04880dbdfd3b5c2ee9 Mon Sep 17 00:00:00 2001
From: Oleh Usik <o.usik@atwix.com>
Date: Thu, 9 Apr 2020 10:14:26 +0300
Subject: [PATCH 026/120] removed redundunt action group

---
 .../StorefrontClickOnMiniCartActionGroup.xml     | 16 ----------------
 1 file changed, 16 deletions(-)
 delete mode 100644 app/code/Magento/SalesRule/Test/Mftf/ActionGroup/StorefrontClickOnMiniCartActionGroup.xml

diff --git a/app/code/Magento/SalesRule/Test/Mftf/ActionGroup/StorefrontClickOnMiniCartActionGroup.xml b/app/code/Magento/SalesRule/Test/Mftf/ActionGroup/StorefrontClickOnMiniCartActionGroup.xml
deleted file mode 100644
index 498695dee9336..0000000000000
--- a/app/code/Magento/SalesRule/Test/Mftf/ActionGroup/StorefrontClickOnMiniCartActionGroup.xml
+++ /dev/null
@@ -1,16 +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="StorefrontClickOnMiniCartActionGroup">
-        <scrollToTopOfPage stepKey="scrollToTheTopOfThePage"/>
-        <waitForElementVisible selector="{{StorefrontMinicartSection.showCart}}" stepKey="waitForElementToBeVisible"/>
-        <click selector="{{StorefrontMinicartSection.showCart}}" stepKey="clickOnMiniCart"/>
-        <waitForPageLoad stepKey="waitForPageToLoad"/>
-    </actionGroup>
-</actionGroups>

From 7bf2131bd6303f4f59a20989440d9c25941ebb52 Mon Sep 17 00:00:00 2001
From: Tu Nguyen <ladiesman9x@gmail.com>
Date: Fri, 10 Apr 2020 04:43:10 -0700
Subject: [PATCH 027/120] Update styles after test

---
 .../backend/Magento_Ui/web/css/source/module/_data-grid.less  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/design/adminhtml/Magento/backend/Magento_Ui/web/css/source/module/_data-grid.less b/app/design/adminhtml/Magento/backend/Magento_Ui/web/css/source/module/_data-grid.less
index bace69f79282e..3e9f2d4401b05 100644
--- a/app/design/adminhtml/Magento/backend/Magento_Ui/web/css/source/module/_data-grid.less
+++ b/app/design/adminhtml/Magento/backend/Magento_Ui/web/css/source/module/_data-grid.less
@@ -227,7 +227,7 @@ body._in-resize {
         font-size: @data-grid__font-size; // Rewrite old styles. Should be deleted afterwards
         line-height: @line-height__base;
         transition: @smooth__background-color;
-        vertical-align: top;
+        vertical-align: middle;
 
         &._resizing {
             border-left: 1px solid @color-blue-pure;
@@ -391,7 +391,7 @@ body._in-resize {
     .data-grid-checkbox-cell {
         overflow: hidden;
         padding: 0;
-        vertical-align: top;
+        vertical-align: middle;
         width: @control-checkbox-radio__size + @data-grid-checkbox-cell-inner__padding-horizontal * 2;
 
         &:hover {

From cd961c4444d60a4a2efdbd711485904d39d9a04d Mon Sep 17 00:00:00 2001
From: Tu Nguyen <ladiesman9x@gmail.com>
Date: Sun, 12 Apr 2020 16:10:58 +0700
Subject: [PATCH 028/120] Remove unwanted styles in email preview

---
 .../adminhtml/layout/adminhtml_email_template_preview.xml   | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/app/code/Magento/Email/view/adminhtml/layout/adminhtml_email_template_preview.xml b/app/code/Magento/Email/view/adminhtml/layout/adminhtml_email_template_preview.xml
index 886a76b3af6f8..f182a110f5b8d 100644
--- a/app/code/Magento/Email/view/adminhtml/layout/adminhtml_email_template_preview.xml
+++ b/app/code/Magento/Email/view/adminhtml/layout/adminhtml_email_template_preview.xml
@@ -6,6 +6,12 @@
  */
 -->
 <page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" layout="admin-1column" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
+    <head>
+        <remove src="extjs/resources/css/ext-all.css"/>
+        <remove src="extjs/resources/css/ytheme-magento.css"/>
+        <remove src="css/styles-old.css"/>
+        <remove src="jquery/jstree/themes/default/style.css"/>
+    </head>
     <body>
         <attribute name="id" value="html-body"/>
         <attribute name="class" value="preview-window"/>

From bcef3f5339b359e195d447f09ee14a2eea140f60 Mon Sep 17 00:00:00 2001
From: Tu Nguyen <ladiesman9x@gmail.com>
Date: Sun, 12 Apr 2020 18:00:58 +0700
Subject: [PATCH 029/120] Update file styles

---
 .../view/adminhtml/layout/adminhtml_email_template_preview.xml   | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/code/Magento/Email/view/adminhtml/layout/adminhtml_email_template_preview.xml b/app/code/Magento/Email/view/adminhtml/layout/adminhtml_email_template_preview.xml
index f182a110f5b8d..de3f2b97d5c3b 100644
--- a/app/code/Magento/Email/view/adminhtml/layout/adminhtml_email_template_preview.xml
+++ b/app/code/Magento/Email/view/adminhtml/layout/adminhtml_email_template_preview.xml
@@ -10,6 +10,7 @@
         <remove src="extjs/resources/css/ext-all.css"/>
         <remove src="extjs/resources/css/ytheme-magento.css"/>
         <remove src="css/styles-old.css"/>
+        <remove src="css/styles.css"/>
         <remove src="jquery/jstree/themes/default/style.css"/>
     </head>
     <body>

From 4807ebb53158ebdd9207ad994ab38d4084c9d1d2 Mon Sep 17 00:00:00 2001
From: dzung kiu <dzung.kiu@balanceinternet.com.au>
Date: Wed, 15 Apr 2020 15:47:56 +0700
Subject: [PATCH 030/120] #23440 add unit test for changed function

---
 .../Model/Order/CreditmemoFactoryTest.php     | 74 +++++++++++++++++++
 1 file changed, 74 insertions(+)
 create mode 100644 app/code/Magento/Sales/Test/Unit/Model/Order/CreditmemoFactoryTest.php

diff --git a/app/code/Magento/Sales/Test/Unit/Model/Order/CreditmemoFactoryTest.php b/app/code/Magento/Sales/Test/Unit/Model/Order/CreditmemoFactoryTest.php
new file mode 100644
index 0000000000000..1778a7e3057c6
--- /dev/null
+++ b/app/code/Magento/Sales/Test/Unit/Model/Order/CreditmemoFactoryTest.php
@@ -0,0 +1,74 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Sales\Test\Unit\Model\Order;
+
+/**
+ * Unit test for creditmemo factory class.
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
+class CreditmemoFactoryTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * Subject of testing.
+     *
+     * @var \Magento\Sales\Model\Order\CreditmemoFactory
+     */
+    protected $subject;
+
+    /**
+     * @return void
+     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
+     */
+    protected function setUp()
+    {
+        $objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
+        $this->subject = $objectManager->getObject(\Magento\Sales\Model\Order\CreditmemoFactory::class, []);
+    }
+
+    /**
+     * Check if order item can be refunded
+     */
+    public function testCanRefundItem()
+    {
+        $orderItem = $this->createPartialMock(
+            \Magento\Sales\Model\Order\Item::class,
+            ['getChildrenItems', 'isDummy', 'getHasChildren', 'getId', 'getParentItemId']
+        );
+        $orderItem->expects($this->any())
+            ->method('getId')
+            ->willReturn(1);
+        $orderItem->expects($this->any())->method('getParentItemId')->willReturn(false);
+        $orderItem->expects($this->any())->method('isDummy')->willReturn(true);
+        $orderItem->expects($this->any())->method('getHasChildren')->willReturn(true);
+        $orderChildItemOne = $this->createPartialMock(
+            \Magento\Sales\Model\Order\Item::class,
+            ['getQtyToRefund', 'getId']
+        );
+        $orderChildItemOne->expects($this->any())->method('getQtyToRefund')->willReturn(1);
+        $orderChildItemOne->expects($this->any())->method('getId')->willReturn(2);
+        $orderChildItemTwo = $this->createPartialMock(
+            \Magento\Sales\Model\Order\Item::class,
+            ['getQtyToRefund', 'getId']
+        );
+        $orderChildItemTwo->expects($this->any())->method('getQtyToRefund')->willReturn(1);
+        $orderChildItemTwo->expects($this->any())->method('getId')->willReturn(3);
+        $orderItem->expects($this->any())->method('getChildrenItems')->willReturn([$orderChildItemOne, $orderChildItemTwo]);
+        $testMethod = new \ReflectionMethod(
+            \Magento\Sales\Model\Order\CreditmemoFactory::class,
+            'canRefundItem'
+        );
+        $orderItemQtys = [
+            2 => 0,
+            3 => 0
+        ];
+        $invoiceQtysRefundLimits = [];
+        $testMethod->setAccessible(true);
+        $result         = $testMethod->invoke($this->subject, $orderItem, $orderItemQtys, $invoiceQtysRefundLimits);
+        $expectedResult = true;
+        $this->assertEquals($expectedResult, $result);
+    }
+}

From b88d88e40ffffd141bed4dd32483148af1ad29fe Mon Sep 17 00:00:00 2001
From: dzung kiu <dzung.kiu@balanceinternet.com.au>
Date: Wed, 15 Apr 2020 19:58:09 +0700
Subject: [PATCH 031/120] #23440 add unit test - fix test code style warning

---
 .../Sales/Test/Unit/Model/Order/CreditmemoFactoryTest.php     | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

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 1778a7e3057c6..13245e3ce2700 100644
--- a/app/code/Magento/Sales/Test/Unit/Model/Order/CreditmemoFactoryTest.php
+++ b/app/code/Magento/Sales/Test/Unit/Model/Order/CreditmemoFactoryTest.php
@@ -56,7 +56,9 @@ public function testCanRefundItem()
         );
         $orderChildItemTwo->expects($this->any())->method('getQtyToRefund')->willReturn(1);
         $orderChildItemTwo->expects($this->any())->method('getId')->willReturn(3);
-        $orderItem->expects($this->any())->method('getChildrenItems')->willReturn([$orderChildItemOne, $orderChildItemTwo]);
+        $orderItem->expects($this->any())
+            ->method('getChildrenItems')
+            ->willReturn([$orderChildItemOne, $orderChildItemTwo]);
         $testMethod = new \ReflectionMethod(
             \Magento\Sales\Model\Order\CreditmemoFactory::class,
             'canRefundItem'

From 10d5f735c83c4588c449c85126882e4fb7bfd337 Mon Sep 17 00:00:00 2001
From: dzung kiu <dzung.kiu@balanceinternet.com.au>
Date: Fri, 17 Apr 2020 12:45:35 +0700
Subject: [PATCH 032/120] #23440 add MFTF test

---
 ...editMemoRefundBundleWithQtyActionGroup.xml |  45 +++++
 .../Section/AdminCreditMemoItemsSection.xml   |   1 +
 ...nCreateCreditmemoWithBundleProductTest.xml | 155 ++++++++++++++++++
 3 files changed, 201 insertions(+)
 create mode 100644 app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminOpenAndFillCreditMemoRefundBundleWithQtyActionGroup.xml
 create mode 100644 app/code/Magento/Sales/Test/Mftf/Test/AdminCreateCreditmemoWithBundleProductTest.xml

diff --git a/app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminOpenAndFillCreditMemoRefundBundleWithQtyActionGroup.xml b/app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminOpenAndFillCreditMemoRefundBundleWithQtyActionGroup.xml
new file mode 100644
index 0000000000000..65a64bdf9eb90
--- /dev/null
+++ b/app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminOpenAndFillCreditMemoRefundBundleWithQtyActionGroup.xml
@@ -0,0 +1,45 @@
+<?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="AdminOpenAndFillCreditMemoRefundBundleWithQtyActionGroup">
+        <annotations>
+            <description>Clicks on the 'Credit Memos' section on the Admin Orders edit page. Fills in the provided Refund details (child item qty, Shipping Refund, Adjustment Refund, Adjustment Fee and Row number).</description>
+        </annotations>
+        <arguments>
+            <argument name="itemQtyToRefund" type="string" defaultValue="0"/>
+            <argument name="shippingRefund" type="string" defaultValue="0"/>
+            <argument name="adjustmentRefund" type="string" defaultValue="0"/>
+            <argument name="adjustmentFee" type="string" defaultValue="0"/>
+            <argument name="rowNumberItemOne" type="string" defaultValue="3"/>
+            <argument name="rowNumberItemTwo" type="string" defaultValue="5"/>
+            <argument name="rowNumberItemThree" type="string" defaultValue="6"/>
+        </arguments>
+        
+        <!-- Click 'Credit Memo' button -->
+        <click selector="{{AdminOrderDetailsMainActionsSection.creditMemo}}" stepKey="clickCreateCreditMemo"/>
+        <seeInCurrentUrl url="{{AdminCreditMemoNewPage.url}}" stepKey="seeNewCreditMemoPage"/>
+        <see selector="{{AdminHeaderSection.pageTitle}}" userInput="New Memo" stepKey="seeNewMemoInPageTitle"/>
+
+        <!-- Fill data from dataset: refund -->
+        <scrollTo selector="{{AdminCreditMemoItemsSection.header}}" stepKey="scrollToItemsToRefund"/>
+        <fillField selector="{{AdminCreditMemoItemsSection.childItemQtyToRefund(rowNumberItemOne)}}" userInput="{{itemQtyToRefund}}" stepKey="fillQtyToRefundItemOne"/>
+        <fillField selector="{{AdminCreditMemoItemsSection.childItemQtyToRefund(rowNumberItemTwo)}}" userInput="{{itemQtyToRefund}}" stepKey="fillQtyToRefundItemTwo"/>
+        <fillField selector="{{AdminCreditMemoItemsSection.childItemQtyToRefund(rowNumberItemThree)}}" userInput="{{itemQtyToRefund}}" stepKey="fillQtyToRefundItemThree"/>
+        <waitForLoadingMaskToDisappear stepKey="waitForActivateButton"/>
+        <conditionalClick selector="{{AdminCreditMemoItemsSection.updateQty}}" dependentSelector="{{AdminCreditMemoItemsSection.disabledUpdateQty}}" visible="false" stepKey="clickUpdateButton"/>
+        <waitForLoadingMaskToDisappear stepKey="waitForUpdate"/>
+        <fillField userInput="{{shippingRefund}}" selector="{{AdminCreditMemoTotalSection.refundShipping}}" stepKey="fillShipping"/>
+        <fillField userInput="{{adjustmentRefund}}" selector="{{AdminCreditMemoTotalSection.adjustmentRefund}}" stepKey="fillAdjustmentRefund"/>
+        <fillField userInput="{{adjustmentFee}}" selector="{{AdminCreditMemoTotalSection.adjustmentFee}}" stepKey="fillAdjustmentFee"/>
+        <waitForElementVisible selector="{{AdminCreditMemoTotalSection.updateTotals}}" stepKey="waitForUpdateTotalsButton"/>
+        <click selector="{{AdminCreditMemoTotalSection.updateTotals}}" stepKey="clickUpdateTotals"/>
+        <checkOption selector="{{AdminCreditMemoTotalSection.emailCopy}}" stepKey="checkSendEmailCopy"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Sales/Test/Mftf/Section/AdminCreditMemoItemsSection.xml b/app/code/Magento/Sales/Test/Mftf/Section/AdminCreditMemoItemsSection.xml
index 74b773b0830d9..fa98843b0199a 100644
--- a/app/code/Magento/Sales/Test/Mftf/Section/AdminCreditMemoItemsSection.xml
+++ b/app/code/Magento/Sales/Test/Mftf/Section/AdminCreditMemoItemsSection.xml
@@ -24,5 +24,6 @@
         <element name="disabledUpdateQty" type="button" selector=".order-creditmemo-tables tfoot button[data-ui-id='order-items-update-button'].disabled" timeout="30"/>
         <element name="nameColumn" type="text" selector=".order-creditmemo-tables .product-title"/>
         <element name="skuColumn" type="text" selector=".order-creditmemo-tables .product-sku-block"/>
+        <element name="childItemQtyToRefund" type="input" selector=".order-creditmemo-tables tr:nth-child({{row}}) td .qty-input" parameterized="true"/>
     </section>
 </sections>
\ No newline at end of file
diff --git a/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateCreditmemoWithBundleProductTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateCreditmemoWithBundleProductTest.xml
new file mode 100644
index 0000000000000..89c7a3176390a
--- /dev/null
+++ b/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateCreditmemoWithBundleProductTest.xml
@@ -0,0 +1,155 @@
+<?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="AdminCreateCreditmemoWithBundleProductTest">
+        <annotations>
+            <title value="Create Creditmemo in Admin with bundle product"/>
+            <stories value="Github issue: #23440 fix Refund for bundle product without receiving product back"/>
+            <description value="Create Creditmemo for bundle product with without receiving product back(all child item qty = 0)"/>
+            <features value="Sales"/>
+            <severity value="AVERAGE"/>
+            <group value="Sales"/>
+        </annotations>
+
+        <before>
+            <!--Set default flat rate shipping method settings-->
+            <createData entity="FlatRateShippingMethodDefault" stepKey="setDefaultFlatRateShippingMethod"/>
+
+            <!--Create simple customer-->
+            <createData entity="Simple_US_Customer_CA" stepKey="simpleCustomer"/>
+
+            <!--Create simple product 1-->
+            <createData entity="ApiProductWithDescription" stepKey="simple1" before="simple2"/>
+
+            <!--Create simple product 2-->
+            <createData entity="ApiProductWithDescription" stepKey="simple2" before="product"/>
+
+            <!--Create bundle product with checkbox bundle option-->
+            <createData entity="ApiBundleProduct" stepKey="product"/>
+            <createData entity="CheckboxOption" stepKey="checkboxBundleOption">
+                <requiredEntity createDataKey="product"/>
+            </createData>
+
+            <!--Link simple product 1 to bundle option with default quantity 2-->
+            <createData entity="ApiBundleLink" stepKey="createBundleLink1">
+                <requiredEntity createDataKey="product"/>
+                <requiredEntity createDataKey="checkboxBundleOption"/>
+                <requiredEntity createDataKey="simple1"/>
+                <field key="qty">2</field>
+                <field key="is_default">1</field>
+            </createData>
+
+            <!--Link simple product 2 to bundle option with default quantity 2-->
+            <createData entity="ApiBundleLink" stepKey="createBundleLink2">
+                <requiredEntity createDataKey="product"/>
+                <requiredEntity createDataKey="checkboxBundleOption"/>
+                <requiredEntity createDataKey="simple2"/>
+                <field key="qty">2</field>
+                <field key="is_default">1</field>
+            </createData>
+
+            <!--Add drop-down bundle option-->
+            <createData entity="DropDownBundleOption" stepKey="dropDownBundleOption">
+                <requiredEntity createDataKey="product"/>
+            </createData>
+
+            <!--Link simple product 1 to drop-down bundle option with default quantity 2-->
+            <createData entity="ApiBundleLink" stepKey="createBundleLink3">
+                <requiredEntity createDataKey="product"/>
+                <requiredEntity createDataKey="dropDownBundleOption"/>
+                <requiredEntity createDataKey="simple1"/>
+                <field key="qty">2</field>
+                <field key="is_default">1</field>
+            </createData>
+
+            <!--Link simple product 2 to drop-down bundle option with default quantity 2-->
+            <createData entity="ApiBundleLink" stepKey="createBundleLink4">
+                <requiredEntity createDataKey="product"/>
+                <requiredEntity createDataKey="dropDownBundleOption"/>
+                <requiredEntity createDataKey="simple2"/>
+                <field key="qty">2</field>
+            </createData>
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+        </before>
+
+        <!--Create new customer order-->
+        <actionGroup ref="navigateToNewOrderPageExistingCustomer" stepKey="navigateToNewOrderWithExistingCustomer">
+            <argument name="customer" value="$$simpleCustomer$$"/>
+        </actionGroup>
+
+        <!--Add bundle product to order and check product price in grid-->
+        <actionGroup ref="addBundleProductToOrderAndCheckPriceInGrid" stepKey="addBundleProductToOrder">
+            <argument name="product" value="$$product$$"/>
+            <argument name="quantity" value="1"/>
+            <argument name="price" value="$738.00"/>
+        </actionGroup>
+
+        <!--Select FlatRate shipping method-->
+        <actionGroup ref="orderSelectFlatRateShipping" stepKey="orderSelectFlatRateShippingMethod"/>
+
+        <!--Submit order-->
+        <click selector="{{AdminOrderFormActionSection.SubmitOrder}}" stepKey="submitOrder"/>
+
+        <!--Verify order information-->
+        <actionGroup ref="verifyCreatedOrderInformation" stepKey="verifyCreatedOrderInformation"/>
+
+
+        <!-- Create Invoice -->
+        <actionGroup ref="StartCreateInvoiceFromOrderPage" stepKey="startInvoice"/>
+        <click selector="{{AdminInvoiceMainActionsSection.submitInvoice}}" stepKey="clickSubmitInvoice"/>
+        <waitForElementVisible selector="{{AdminMessagesSection.success}}" stepKey="waitForMessageAppears"/>
+        <see selector="{{AdminMessagesSection.success}}" userInput="The invoice has been created." stepKey="seeInvoiceCreateSuccess"/>
+
+        <!-- Go to Sales > Orders > find out placed order and open -->
+        <grabTextFrom selector="|Order # (\d+)|" stepKey="grabOrderId" />
+        <assertNotEmpty actual="$grabOrderId" stepKey="assertOrderIdIsNotEmpty" after="grabOrderId"/>
+        <actionGroup ref="OpenOrderById" stepKey="openOrder">
+            <argument name="orderId" value="{$grabOrderId}"/>
+        </actionGroup>
+
+        <!-- Click 'Credit Memo' button and fill data from dataset: partial refund -->
+        <actionGroup ref="AdminOpenAndFillCreditMemoRefundBundleWithQtyActionGroup" stepKey="fillCreditMemoRefund">
+            <argument name="itemQtyToRefund" value="0"/>
+            <argument name="rowNumberItemOne" value="3"/>
+            <argument name="rowNumberItemTwo" value="5"/>
+            <argument name="rowNumberItemThree" value="6"/>
+            <argument name="adjustmentRefund" value="10"/>
+        </actionGroup>
+
+        <!-- On order's page click 'Refund offline' button -->
+        <click selector="{{AdminCreditMemoTotalSection.submitRefundOffline}}" stepKey="clickRefundOffline"/>
+        <waitForPageLoad stepKey="waitForResultPage"/>
+
+        <!-- Perform all assertions: assert refund success create message -->
+        <see selector="{{AdminIndexManagementSection.successMessage}}" userInput="You created the credit memo." stepKey="assertRefundSuccessCreateMessage"/>
+
+        <!--Assert refund in Credit Memo Tab -->
+        <click selector="{{AdminOrderDetailsOrderViewSection.creditMemos}}" stepKey="clickCreditMemoTab"/>
+        <waitForPageLoad stepKey="waitForTabLoad"/>
+        <grabTextFrom selector="{{AdminCreditMemosGridSection.memoId}}" stepKey="grabMemoId"/>
+        <assertNotEmpty actual="$grabMemoId" stepKey="assertMemoIdIsNotEmpty" after="grabMemoId"/>
+        <click selector="{{AdminCreditMemosGridSection.memoId}}" stepKey="clickView"/>
+        <waitForPageLoad stepKey="waitForCreditMemo"/>
+        <scrollTo selector="{{AdminCreditMemoViewTotalSection.subtotal}}" stepKey="scrollToTotal"/>
+        <see selector="{{AdminCreditMemoViewTotalSection.subtotal}}" userInput="$0.00" stepKey="seeSubtotal"/>
+        <see selector="{{AdminCreditMemoViewTotalSection.adjustmentRefund}}" userInput="$10.00" stepKey="seeAdjustmentRefund"/>
+        <see selector="{{AdminCreditMemoViewTotalSection.adjustmentFee}}" userInput="$0.00" stepKey="seeAdjustmentFee"/>
+        <see selector="{{AdminCreditMemoViewTotalSection.grandTotal}}" userInput="$10.00" stepKey="assertRefundOnCreditMemoTab"/>
+
+        <after>
+            <actionGroup ref="logout" stepKey="logout"/>
+
+            <deleteData createDataKey="product" stepKey="delete"/>
+            <deleteData createDataKey="simpleCustomer" stepKey="deleteSimpleCustomer"/>
+            <deleteData createDataKey="simple1" stepKey="deleteSimple1" before="deleteSimple2"/>
+            <deleteData createDataKey="simple2" stepKey="deleteSimple2" before="delete"/>
+        </after>
+    </test>
+</tests>

From b13b0ec728c1a06410602e5f018fab5b2d19b847 Mon Sep 17 00:00:00 2001
From: dzung kiu <dzung.kiu@balanceinternet.com.au>
Date: Fri, 17 Apr 2020 13:48:32 +0700
Subject: [PATCH 033/120] #23440 update identical condition

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

diff --git a/app/code/Magento/Sales/Model/Order/CreditmemoFactory.php b/app/code/Magento/Sales/Model/Order/CreditmemoFactory.php
index 103ed3e2fa3c5..8a278ae6591b7 100644
--- a/app/code/Magento/Sales/Model/Order/CreditmemoFactory.php
+++ b/app/code/Magento/Sales/Model/Order/CreditmemoFactory.php
@@ -147,7 +147,7 @@ protected function canRefundItem($item, $qtys = [], $invoiceQtysRefundLimits = [
         if ($item->isDummy()) {
             if ($item->getHasChildren()) {
                 foreach ($item->getChildrenItems() as $child) {
-                    if (empty($qtys) || (count(array_unique($qtys)) === 1 && end($qtys) == 0)) {
+                    if (empty($qtys) || (count(array_unique($qtys)) === 1 && (int)end($qtys) === 0)) {
                         if ($this->canRefundNoDummyItem($child, $invoiceQtysRefundLimits)) {
                             return true;
                         }

From 9de9cf0df827d7f1741854ffa1f3f15ff82c711b Mon Sep 17 00:00:00 2001
From: dzung kiu <dzung.kiu@balanceinternet.com.au>
Date: Fri, 17 Apr 2020 18:34:53 +0700
Subject: [PATCH 034/120] #23440 add MFTF test

---
 .../AdminCreateCreditmemoWithBundleProductTest.xml   | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateCreditmemoWithBundleProductTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateCreditmemoWithBundleProductTest.xml
index 89c7a3176390a..1feda9f723edc 100644
--- a/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateCreditmemoWithBundleProductTest.xml
+++ b/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateCreditmemoWithBundleProductTest.xml
@@ -76,7 +76,7 @@
                 <requiredEntity createDataKey="simple2"/>
                 <field key="qty">2</field>
             </createData>
-            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+            <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
         </before>
 
         <!--Create new customer order-->
@@ -109,7 +109,9 @@
 
         <!-- Go to Sales > Orders > find out placed order and open -->
         <grabTextFrom selector="|Order # (\d+)|" stepKey="grabOrderId" />
-        <assertNotEmpty actual="$grabOrderId" stepKey="assertOrderIdIsNotEmpty" after="grabOrderId"/>
+        <assertNotEmpty stepKey="assertOrderIdIsNotEmpty" after="grabOrderId">
+            <actualResult type="const">$grabOrderId</actualResult>
+        </assertNotEmpty>
         <actionGroup ref="OpenOrderById" stepKey="openOrder">
             <argument name="orderId" value="{$grabOrderId}"/>
         </actionGroup>
@@ -134,7 +136,9 @@
         <click selector="{{AdminOrderDetailsOrderViewSection.creditMemos}}" stepKey="clickCreditMemoTab"/>
         <waitForPageLoad stepKey="waitForTabLoad"/>
         <grabTextFrom selector="{{AdminCreditMemosGridSection.memoId}}" stepKey="grabMemoId"/>
-        <assertNotEmpty actual="$grabMemoId" stepKey="assertMemoIdIsNotEmpty" after="grabMemoId"/>
+        <assertNotEmpty stepKey="assertMemoIdIsNotEmpty" after="grabMemoId">
+            <actualResult type="const">$grabMemoId</actualResult>
+        </assertNotEmpty>
         <click selector="{{AdminCreditMemosGridSection.memoId}}" stepKey="clickView"/>
         <waitForPageLoad stepKey="waitForCreditMemo"/>
         <scrollTo selector="{{AdminCreditMemoViewTotalSection.subtotal}}" stepKey="scrollToTotal"/>
@@ -144,7 +148,7 @@
         <see selector="{{AdminCreditMemoViewTotalSection.grandTotal}}" userInput="$10.00" stepKey="assertRefundOnCreditMemoTab"/>
 
         <after>
-            <actionGroup ref="logout" stepKey="logout"/>
+            <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
 
             <deleteData createDataKey="product" stepKey="delete"/>
             <deleteData createDataKey="simpleCustomer" stepKey="deleteSimpleCustomer"/>

From a7ea256e1741716a5ab49345a7aa3d65d493a20d Mon Sep 17 00:00:00 2001
From: dzung kiu <dzung.kiu@balanceinternet.com.au>
Date: Fri, 17 Apr 2020 19:39:08 +0700
Subject: [PATCH 035/120] #23440 add MFTF - update action ref

---
 .../AdminCreateCreditmemoWithBundleProductTest.xml   | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateCreditmemoWithBundleProductTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateCreditmemoWithBundleProductTest.xml
index 1feda9f723edc..0967bb5106e5c 100644
--- a/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateCreditmemoWithBundleProductTest.xml
+++ b/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateCreditmemoWithBundleProductTest.xml
@@ -80,29 +80,29 @@
         </before>
 
         <!--Create new customer order-->
-        <actionGroup ref="navigateToNewOrderPageExistingCustomer" stepKey="navigateToNewOrderWithExistingCustomer">
+        <actionGroup ref="NavigateToNewOrderPageExistingCustomerActionGroup" stepKey="navigateToNewOrderWithExistingCustomer">
             <argument name="customer" value="$$simpleCustomer$$"/>
         </actionGroup>
 
         <!--Add bundle product to order and check product price in grid-->
-        <actionGroup ref="addBundleProductToOrderAndCheckPriceInGrid" stepKey="addBundleProductToOrder">
+        <actionGroup ref="AddBundleProductToOrderAndCheckPriceInGridActionGroup" stepKey="addBundleProductToOrder">
             <argument name="product" value="$$product$$"/>
             <argument name="quantity" value="1"/>
             <argument name="price" value="$738.00"/>
         </actionGroup>
 
         <!--Select FlatRate shipping method-->
-        <actionGroup ref="orderSelectFlatRateShipping" stepKey="orderSelectFlatRateShippingMethod"/>
+        <actionGroup ref="OrderSelectFlatRateShippingActionGroup" stepKey="orderSelectFlatRateShippingMethod"/>
 
         <!--Submit order-->
         <click selector="{{AdminOrderFormActionSection.SubmitOrder}}" stepKey="submitOrder"/>
 
         <!--Verify order information-->
-        <actionGroup ref="verifyCreatedOrderInformation" stepKey="verifyCreatedOrderInformation"/>
+        <actionGroup ref="VerifyCreatedOrderInformationActionGroup" stepKey="verifyCreatedOrderInformation"/>
 
 
         <!-- Create Invoice -->
-        <actionGroup ref="StartCreateInvoiceFromOrderPage" stepKey="startInvoice"/>
+        <actionGroup ref="StartCreateInvoiceFromOrderPageActionGroup" stepKey="startInvoice"/>
         <click selector="{{AdminInvoiceMainActionsSection.submitInvoice}}" stepKey="clickSubmitInvoice"/>
         <waitForElementVisible selector="{{AdminMessagesSection.success}}" stepKey="waitForMessageAppears"/>
         <see selector="{{AdminMessagesSection.success}}" userInput="The invoice has been created." stepKey="seeInvoiceCreateSuccess"/>
@@ -112,7 +112,7 @@
         <assertNotEmpty stepKey="assertOrderIdIsNotEmpty" after="grabOrderId">
             <actualResult type="const">$grabOrderId</actualResult>
         </assertNotEmpty>
-        <actionGroup ref="OpenOrderById" stepKey="openOrder">
+        <actionGroup ref="OpenOrderByIdActionGroup" stepKey="openOrder">
             <argument name="orderId" value="{$grabOrderId}"/>
         </actionGroup>
 

From 632529fd11d26ff31f1c37a1eaf5372e27eaae97 Mon Sep 17 00:00:00 2001
From: Mateusz Krzeszowiak <mateusz.krzeszowiak@creativestyle.pl>
Date: Sat, 18 Apr 2020 16:45:13 +0200
Subject: [PATCH 036/120] Fix static tests

---
 .../Framework/RequireJs/Test/Unit/ConfigTest.php   | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/lib/internal/Magento/Framework/RequireJs/Test/Unit/ConfigTest.php b/lib/internal/Magento/Framework/RequireJs/Test/Unit/ConfigTest.php
index 5288625981169..d2c53202d5f78 100644
--- a/lib/internal/Magento/Framework/RequireJs/Test/Unit/ConfigTest.php
+++ b/lib/internal/Magento/Framework/RequireJs/Test/Unit/ConfigTest.php
@@ -12,22 +12,22 @@
 class ConfigTest extends \PHPUnit\Framework\TestCase
 {
     /**
-     * @var \Magento\Framework\RequireJs\Config\File\Collector\Aggregated|\PHPUnit_Framework_MockObject_MockObject
+     * @var \Magento\Framework\RequireJs\Config\File\Collector\Aggregated|\PHPUnit\Framework\MockObject\MockObject
      */
     private $fileSource;
 
     /**
-     * @var \Magento\Framework\View\DesignInterface|\PHPUnit_Framework_MockObject_MockObject
+     * @var \Magento\Framework\View\DesignInterface|\PHPUnit\Framework\MockObject\MockObject
      */
     private $design;
 
     /**
-     * @var \Magento\Framework\Filesystem\File\Read|\PHPUnit_Framework_MockObject_MockObject
+     * @var \Magento\Framework\Filesystem\File\Read|\PHPUnit\Framework\MockObject\MockObject
      */
     private $fileReader;
 
     /**
-     * @var \Magento\Framework\View\Asset\ContextInterface|\PHPUnit_Framework_MockObject_MockObject
+     * @var \Magento\Framework\View\Asset\ContextInterface|\PHPUnit\Framework\MockObject\MockObject
      */
     private $context;
 
@@ -37,17 +37,17 @@ class ConfigTest extends \PHPUnit\Framework\TestCase
     private $object;
 
     /**
-     * @var \Magento\Framework\View\Asset\Minification|\PHPUnit_Framework_MockObject_MockObject
+     * @var \Magento\Framework\View\Asset\Minification|\PHPUnit\Framework\MockObject\MockObject
      */
     private $minificationMock;
 
     /**
-     * @var \Magento\Framework\Code\Minifier\AdapterInterface|\PHPUnit_Framework_MockObject_MockObject
+     * @var \Magento\Framework\Code\Minifier\AdapterInterface|\PHPUnit\Framework\MockObject\MockObject
      */
     private $minifyAdapterMock;
 
     /**
-     * @var RepositoryMap|\PHPUnit_Framework_MockObject_MockObject
+     * @var RepositoryMap|\PHPUnit\Framework\MockObject\MockObject
      */
     private $repositoryMapMock;
 

From 27805df2d2d61bb2290123ad6bdf8e1b0939e42a Mon Sep 17 00:00:00 2001
From: Mateusz Krzeszowiak <mateusz.krzeszowiak@creativestyle.pl>
Date: Sat, 18 Apr 2020 17:09:58 +0200
Subject: [PATCH 037/120] Modularize code a bit

---
 .../Controller/Result/JsFooterPlugin.php      | 61 +++++++++++--------
 1 file changed, 34 insertions(+), 27 deletions(-)

diff --git a/app/code/Magento/Theme/Controller/Result/JsFooterPlugin.php b/app/code/Magento/Theme/Controller/Result/JsFooterPlugin.php
index c8716ae7e08fa..dbdd8fa7146ee 100644
--- a/app/code/Magento/Theme/Controller/Result/JsFooterPlugin.php
+++ b/app/code/Magento/Theme/Controller/Result/JsFooterPlugin.php
@@ -12,7 +12,7 @@
 use Magento\Framework\App\Response\Http;
 
 /**
- * Plugin for putting all js to footer.
+ * Plugin for putting all JavaScript tags to the end of body.
  */
 class JsFooterPlugin
 {
@@ -32,7 +32,7 @@ public function __construct(ScopeConfigInterface $scopeConfig)
     }
 
     /**
-     * Put all javascript to footer before sending the response.
+     * Moves all JavaScript tags to the end of body if this feature is enabled.
      *
      * @param Http $subject
      * @return void
@@ -40,37 +40,44 @@ public function __construct(ScopeConfigInterface $scopeConfig)
     public function beforeSendResponse(Http $subject)
     {
         $content = (string)$subject->getContent();
+        $bodyEndTag = '</body';
+        $isEndBodyTagFound = strpos($content, $bodyEndTag) !== false;
+        $shouldMoveJsToBottom = $this->scopeConfig->isSetFlag(self::XML_PATH_DEV_MOVE_JS_TO_BOTTOM, ScopeInterface::SCOPE_STORE);
 
-        $bodyClose = '</body';
-
-        if (strpos($content, $bodyClose) !== false && $this->scopeConfig->isSetFlag(
-            self::XML_PATH_DEV_MOVE_JS_TO_BOTTOM,
-            ScopeInterface::SCOPE_STORE
-        )) {
-            $scripts = '';
-            $scriptOpen = '<script';
-            $scriptClose = '</script>';
-            $scriptOpenPos = strpos($content, $scriptOpen);
+        if ($isEndBodyTagFound && $shouldMoveJsToBottom) {
+            if ($scripts = $this->extractScriptTags($content)) {
+                $content = str_replace($bodyEndTag, "$scripts\n$bodyEndTag", $content);
+                $subject->setContent($content);
+            }
+        }
+    }
 
-            while ($scriptOpenPos !== false) {
-                $scriptClosePos = strpos($content, $scriptClose, $scriptOpenPos);
-                $script = substr($content, $scriptOpenPos, $scriptClosePos - $scriptOpenPos + strlen($scriptClose));
+    /**
+     * Extracts and returns script tags found in given content.
+     */
+    public function extractScriptTags(&$content)
+    {
+        $scripts = '';
+        $scriptOpen = '<script';
+        $scriptClose = '</script>';
+        $scriptOpenPos = strpos($content, $scriptOpen);
 
-                if (strpos($script, 'text/x-magento-template') !== false) {
-                    $scriptOpenPos = strpos($content, $scriptOpen, $scriptClosePos);
-                    continue;
-                }
+        while ($scriptOpenPos !== false) {
+            $scriptClosePos = strpos($content, $scriptClose, $scriptOpenPos);
+            $script = substr($content, $scriptOpenPos, $scriptClosePos - $scriptOpenPos + strlen($scriptClose));
+            $isXMagentoTemplate = strpos($script, 'text/x-magento-template') !== false;
 
-                $scripts .= "\n" . $script;
-                $content = str_replace($script, '', $content);
-                // Script cut out, continue search from its position.
-                $scriptOpenPos = strpos($content, $scriptOpen, $scriptOpenPos);
+            if ($isXMagentoTemplate) {
+                $scriptOpenPos = strpos($content, $scriptOpen, $scriptClosePos);
+                continue;
             }
 
-            if ($scripts) {
-                $content = str_replace($bodyClose, $scripts . "\n" . $bodyClose, $content);
-                $subject->setContent($content);
-            }
+            $scripts .= "\n" . $script;
+            $content = str_replace($script, '', $content);
+            // Script cut out, continue search from its position.
+            $scriptOpenPos = strpos($content, $scriptOpen, $scriptOpenPos);
         }
+
+        return $scripts;
     }
 }

From 693507fde3894bbe98b77b4b24740b9503244f9f Mon Sep 17 00:00:00 2001
From: Mateusz Krzeszowiak <mateusz.krzeszowiak@creativestyle.pl>
Date: Sat, 18 Apr 2020 17:10:06 +0200
Subject: [PATCH 038/120] Fix static tests

---
 .../Unit/Controller/Result/JsFooterPluginTest.php    | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/app/code/Magento/Theme/Test/Unit/Controller/Result/JsFooterPluginTest.php b/app/code/Magento/Theme/Test/Unit/Controller/Result/JsFooterPluginTest.php
index f3ae9391bbde1..3175dc1deb867 100644
--- a/app/code/Magento/Theme/Test/Unit/Controller/Result/JsFooterPluginTest.php
+++ b/app/code/Magento/Theme/Test/Unit/Controller/Result/JsFooterPluginTest.php
@@ -129,9 +129,6 @@ public function testBeforeSendResponse($content, $isSetFlag, $result): void
     public function ifGetContentIsNotAStringDataProvider(): array
     {
         return [
-            'empty_array' => [
-                'content' => []
-            ],
             'null' => [
                 'content' => null
             ]
@@ -151,13 +148,8 @@ public function testBeforeSendResponseIfGetContentIsNotAString($content): void
             ->method('getContent')
             ->willReturn($content);
 
-        $this->scopeConfigMock->expects($this->never())
-            ->method('isSetFlag')
-            ->with(
-                self::STUB_XML_PATH_DEV_MOVE_JS_TO_BOTTOM,
-                ScopeInterface::SCOPE_STORE
-            )
-            ->willReturn(false);
+        $this->httpMock->expects($this->never())
+            ->method('setContent');
 
         $this->plugin->beforeSendResponse($this->httpMock);
     }

From 31b045682218f127a6239de1ff8bafd9b4dde4df Mon Sep 17 00:00:00 2001
From: Mateusz Krzeszowiak <mateusz.krzeszowiak@creativestyle.pl>
Date: Sat, 18 Apr 2020 20:15:35 +0200
Subject: [PATCH 039/120] Fix static tests

---
 app/code/Magento/Theme/Controller/Result/JsFooterPlugin.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/app/code/Magento/Theme/Controller/Result/JsFooterPlugin.php b/app/code/Magento/Theme/Controller/Result/JsFooterPlugin.php
index dbdd8fa7146ee..1314acea7aa1d 100644
--- a/app/code/Magento/Theme/Controller/Result/JsFooterPlugin.php
+++ b/app/code/Magento/Theme/Controller/Result/JsFooterPlugin.php
@@ -42,7 +42,9 @@ public function beforeSendResponse(Http $subject)
         $content = (string)$subject->getContent();
         $bodyEndTag = '</body';
         $isEndBodyTagFound = strpos($content, $bodyEndTag) !== false;
-        $shouldMoveJsToBottom = $this->scopeConfig->isSetFlag(self::XML_PATH_DEV_MOVE_JS_TO_BOTTOM, ScopeInterface::SCOPE_STORE);
+        $shouldMoveJsToBottom = $this->scopeConfig->isSetFlag(
+            self::XML_PATH_DEV_MOVE_JS_TO_BOTTOM, ScopeInterface::SCOPE_STORE
+        );
 
         if ($isEndBodyTagFound && $shouldMoveJsToBottom) {
             if ($scripts = $this->extractScriptTags($content)) {
@@ -54,6 +56,8 @@ public function beforeSendResponse(Http $subject)
 
     /**
      * Extracts and returns script tags found in given content.
+     * 
+     * @param string $content
      */
     public function extractScriptTags(&$content)
     {

From b54ce80fa8845358d9f8c7ddc76a4f076e885e62 Mon Sep 17 00:00:00 2001
From: Mateusz Krzeszowiak <mateusz.krzeszowiak@creativestyle.pl>
Date: Sat, 18 Apr 2020 21:10:48 +0200
Subject: [PATCH 040/120] Fix static tests

---
 app/code/Magento/Theme/Controller/Result/JsFooterPlugin.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/Theme/Controller/Result/JsFooterPlugin.php b/app/code/Magento/Theme/Controller/Result/JsFooterPlugin.php
index 1314acea7aa1d..49ed094288107 100644
--- a/app/code/Magento/Theme/Controller/Result/JsFooterPlugin.php
+++ b/app/code/Magento/Theme/Controller/Result/JsFooterPlugin.php
@@ -43,7 +43,8 @@ public function beforeSendResponse(Http $subject)
         $bodyEndTag = '</body';
         $isEndBodyTagFound = strpos($content, $bodyEndTag) !== false;
         $shouldMoveJsToBottom = $this->scopeConfig->isSetFlag(
-            self::XML_PATH_DEV_MOVE_JS_TO_BOTTOM, ScopeInterface::SCOPE_STORE
+            self::XML_PATH_DEV_MOVE_JS_TO_BOTTOM,
+            ScopeInterface::SCOPE_STORE
         );
 
         if ($isEndBodyTagFound && $shouldMoveJsToBottom) {
@@ -56,7 +57,7 @@ public function beforeSendResponse(Http $subject)
 
     /**
      * Extracts and returns script tags found in given content.
-     * 
+     *
      * @param string $content
      */
     public function extractScriptTags(&$content)

From 036f99fd1e6996724d9d91af19e9ff2edb0bb9ca Mon Sep 17 00:00:00 2001
From: Mateusz Krzeszowiak <matkrzesz@gmail.com>
Date: Mon, 20 Apr 2020 15:12:35 +0200
Subject: [PATCH 041/120] Apply suggestions from code review

Co-Authored-By: Ihor Sviziev <ihor-sviziev@users.noreply.github.com>
---
 app/code/Magento/Theme/Controller/Result/JsFooterPlugin.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/Theme/Controller/Result/JsFooterPlugin.php b/app/code/Magento/Theme/Controller/Result/JsFooterPlugin.php
index 49ed094288107..7d117fd5b6c0b 100644
--- a/app/code/Magento/Theme/Controller/Result/JsFooterPlugin.php
+++ b/app/code/Magento/Theme/Controller/Result/JsFooterPlugin.php
@@ -48,7 +48,8 @@ public function beforeSendResponse(Http $subject)
         );
 
         if ($isEndBodyTagFound && $shouldMoveJsToBottom) {
-            if ($scripts = $this->extractScriptTags($content)) {
+            $scripts = $this->extractScriptTags($content)
+            if ($scripts) {
                 $content = str_replace($bodyEndTag, "$scripts\n$bodyEndTag", $content);
                 $subject->setContent($content);
             }
@@ -60,7 +61,7 @@ public function beforeSendResponse(Http $subject)
      *
      * @param string $content
      */
-    public function extractScriptTags(&$content)
+    private function extractScriptTags(&$content): string
     {
         $scripts = '';
         $scriptOpen = '<script';

From 9687370475af12abea586dd94bfb1ede3800acb2 Mon Sep 17 00:00:00 2001
From: Mateusz Krzeszowiak <mateusz.krzeszowiak@creativestyle.pl>
Date: Mon, 20 Apr 2020 16:49:42 +0200
Subject: [PATCH 042/120] Fix syntax error

---
 app/code/Magento/Theme/Controller/Result/JsFooterPlugin.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/Theme/Controller/Result/JsFooterPlugin.php b/app/code/Magento/Theme/Controller/Result/JsFooterPlugin.php
index 7d117fd5b6c0b..e0b2d5595bf80 100644
--- a/app/code/Magento/Theme/Controller/Result/JsFooterPlugin.php
+++ b/app/code/Magento/Theme/Controller/Result/JsFooterPlugin.php
@@ -48,7 +48,7 @@ public function beforeSendResponse(Http $subject)
         );
 
         if ($isEndBodyTagFound && $shouldMoveJsToBottom) {
-            $scripts = $this->extractScriptTags($content)
+            $scripts = $this->extractScriptTags($content);
             if ($scripts) {
                 $content = str_replace($bodyEndTag, "$scripts\n$bodyEndTag", $content);
                 $subject->setContent($content);

From b2547c808efed96edfa76a5d64173f006ce09e79 Mon Sep 17 00:00:00 2001
From: Nikola Lardev <nikola.lardev@tryzens.com>
Date: Thu, 23 Apr 2020 19:39:26 +0300
Subject: [PATCH 043/120] Adding bulgarian regions

---
 .../Setup/Patch/Data/AddDataForBulgaria.php   | 122 ++++++++++++++++++
 1 file changed, 122 insertions(+)
 create mode 100644 app/code/Magento/Directory/Setup/Patch/Data/AddDataForBulgaria.php

diff --git a/app/code/Magento/Directory/Setup/Patch/Data/AddDataForBulgaria.php b/app/code/Magento/Directory/Setup/Patch/Data/AddDataForBulgaria.php
new file mode 100644
index 0000000000000..3f28de44f6012
--- /dev/null
+++ b/app/code/Magento/Directory/Setup/Patch/Data/AddDataForBulgaria.php
@@ -0,0 +1,122 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Directory\Setup\Patch\Data;
+
+use Magento\Directory\Setup\DataInstaller;
+use Magento\Framework\App\ResourceConnection;
+use Magento\Framework\Setup\ModuleDataSetupInterface;
+use Magento\Framework\Setup\Patch\DataPatchInterface;
+use Magento\Framework\Setup\Patch\PatchVersionInterface;
+
+/**
+ * Class AddDataForBulgaria
+ * @package Magento\Directory\Setup\Patch
+ */
+class AddDataForCroatia implements DataPatchInterface, PatchVersionInterface
+{
+    /**
+     * @var ModuleDataSetupInterface
+     */
+    private $moduleDataSetup;
+
+    /**
+     * @var \Magento\Directory\Setup\DataInstallerFactory
+     */
+    private $dataInstallerFactory;
+
+    /**
+     * AddDataForCroatia constructor.
+     *
+     * @param ModuleDataSetupInterface $moduleDataSetup
+     * @param \Magento\Directory\Setup\DataInstallerFactory $dataInstallerFactory
+     */
+    public function __construct(
+        ModuleDataSetupInterface $moduleDataSetup,
+        \Magento\Directory\Setup\DataInstallerFactory $dataInstallerFactory
+    ) {
+        $this->moduleDataSetup = $moduleDataSetup;
+        $this->dataInstallerFactory = $dataInstallerFactory;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function apply()
+    {
+        /** @var DataInstaller $dataInstaller */
+        $dataInstaller = $this->dataInstallerFactory->create();
+        $dataInstaller->addCountryRegions(
+            $this->moduleDataSetup->getConnection(),
+            $this->getDataForCroatia()
+        );
+    }
+
+    /**
+     * Croatian states data.
+     *
+     * @return array
+     */
+    private function getDataForCroatia()
+    {
+        return [
+            ['BG', 'BG-01', 'Blagoevgrad'],
+            ['BG', 'BG-02', 'Burgas'],
+            ['BG', 'BG-03', 'Varna'],
+            ['BG', 'BG-04', 'Veliko Tarnovo'],
+            ['BG', 'BG-05', 'Vidin'],
+            ['BG', 'BG-06', 'Vratsa'],
+            ['BG', 'BG-07', 'Gabrovo'],
+            ['BG', 'BG-08', 'Dobrich'],
+            ['BG', 'BG-09', 'Kardzhali'],
+            ['BG', 'BG-10', 'Kyustendil'],
+            ['BG', 'BG-11', 'Lovech'],
+            ['BG', 'BG-12', 'Montana'],
+            ['BG', 'BG-13', 'Pazardzhik'],
+            ['BG', 'BG-14', 'Pernik'],
+            ['BG', 'BG-15', 'Pleven'],
+            ['BG', 'BG-16', 'Plovdiv'],
+            ['BG', 'BG-17', 'Razgrad'],
+            ['BG', 'BG-18', 'Ruse'],
+            ['BG', 'BG-19', 'Silistra'],
+            ['BG', 'BG-20', 'Sliven'],
+            ['BG', 'BG-21', 'Smolyan'],
+            ['BG', 'BG-22', 'Sofia City'],
+            ['BG', 'BG-23', 'Sofia Province'],
+            ['BG', 'BG-24', 'Stara Zagora'],
+            ['BG', 'BG-25', 'Targovishte'],
+            ['BG', 'BG-26', 'Haskovo'],
+            ['BG', 'BG-27', 'Shumen'],
+            ['BG', 'BG-28', 'Yambol'],
+        ];
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public static function getDependencies()
+    {
+        return [
+            InitializeDirectoryData::class,
+        ];
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public static function getVersion()
+    {
+        return '';
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getAliases()
+    {
+        return [];
+    }
+}

From 9bced3584b6d193fbd716990959e28dd4cfd9ee9 Mon Sep 17 00:00:00 2001
From: Nikola Lardev <nikola.lardev@tryzens.com>
Date: Thu, 23 Apr 2020 19:46:17 +0300
Subject: [PATCH 044/120] Bulgarian states data

---
 .../Directory/Setup/Patch/Data/AddDataForBulgaria.php  | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/code/Magento/Directory/Setup/Patch/Data/AddDataForBulgaria.php b/app/code/Magento/Directory/Setup/Patch/Data/AddDataForBulgaria.php
index 3f28de44f6012..fd86941a9f9c1 100644
--- a/app/code/Magento/Directory/Setup/Patch/Data/AddDataForBulgaria.php
+++ b/app/code/Magento/Directory/Setup/Patch/Data/AddDataForBulgaria.php
@@ -16,7 +16,7 @@
  * Class AddDataForBulgaria
  * @package Magento\Directory\Setup\Patch
  */
-class AddDataForCroatia implements DataPatchInterface, PatchVersionInterface
+class AddDataForBulgaria implements DataPatchInterface, PatchVersionInterface
 {
     /**
      * @var ModuleDataSetupInterface
@@ -29,7 +29,7 @@ class AddDataForCroatia implements DataPatchInterface, PatchVersionInterface
     private $dataInstallerFactory;
 
     /**
-     * AddDataForCroatia constructor.
+     * AddDataForBulgaria constructor.
      *
      * @param ModuleDataSetupInterface $moduleDataSetup
      * @param \Magento\Directory\Setup\DataInstallerFactory $dataInstallerFactory
@@ -51,16 +51,16 @@ public function apply()
         $dataInstaller = $this->dataInstallerFactory->create();
         $dataInstaller->addCountryRegions(
             $this->moduleDataSetup->getConnection(),
-            $this->getDataForCroatia()
+            $this->getDataForBulgaria()
         );
     }
 
     /**
-     * Croatian states data.
+     * Bulgarian states data.
      *
      * @return array
      */
-    private function getDataForCroatia()
+    private function getDataForBulgaria()
     {
         return [
             ['BG', 'BG-01', 'Blagoevgrad'],

From 12dfb494a2449a7f235341b103855bdcf919e069 Mon Sep 17 00:00:00 2001
From: Nikola Lardev <nikola.lardev@tryzens.com>
Date: Fri, 24 Apr 2020 00:31:28 +0300
Subject: [PATCH 045/120] Fix code style issues

---
 .../Setup/Patch/Data/AddDataForBulgaria.php         | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/app/code/Magento/Directory/Setup/Patch/Data/AddDataForBulgaria.php b/app/code/Magento/Directory/Setup/Patch/Data/AddDataForBulgaria.php
index fd86941a9f9c1..d4b3f22823a66 100644
--- a/app/code/Magento/Directory/Setup/Patch/Data/AddDataForBulgaria.php
+++ b/app/code/Magento/Directory/Setup/Patch/Data/AddDataForBulgaria.php
@@ -4,6 +4,8 @@
  * See COPYING.txt for license details.
  */
 
+declare(strict_types=1);
+
 namespace Magento\Directory\Setup\Patch\Data;
 
 use Magento\Directory\Setup\DataInstaller;
@@ -13,8 +15,9 @@
 use Magento\Framework\Setup\Patch\PatchVersionInterface;
 
 /**
+ * Add Bulgaria States
+ * 
  * Class AddDataForBulgaria
- * @package Magento\Directory\Setup\Patch
  */
 class AddDataForBulgaria implements DataPatchInterface, PatchVersionInterface
 {
@@ -43,7 +46,7 @@ public function __construct(
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function apply()
     {
@@ -95,7 +98,7 @@ private function getDataForBulgaria()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public static function getDependencies()
     {
@@ -105,7 +108,7 @@ public static function getDependencies()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public static function getVersion()
     {
@@ -113,7 +116,7 @@ public static function getVersion()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getAliases()
     {

From 84ff07645320eadedee48b9f3ffdab683c59bc9e Mon Sep 17 00:00:00 2001
From: engcom-Echo <engcom-vendorworker-echo@adobe.com>
Date: Tue, 28 Apr 2020 13:22:04 +0300
Subject: [PATCH 046/120] refactoring - unit, mftf tests

---
 ...nCreateCreditmemoWithBundleProductTest.xml |  93 +++----------
 .../Model/Order/CreditmemoFactoryTest.php     | 129 ++++++++++++------
 2 files changed, 107 insertions(+), 115 deletions(-)

diff --git a/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateCreditmemoWithBundleProductTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateCreditmemoWithBundleProductTest.xml
index 0967bb5106e5c..3a9b252a95a3d 100644
--- a/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateCreditmemoWithBundleProductTest.xml
+++ b/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateCreditmemoWithBundleProductTest.xml
@@ -19,25 +19,14 @@
         </annotations>
 
         <before>
-            <!--Set default flat rate shipping method settings-->
             <createData entity="FlatRateShippingMethodDefault" stepKey="setDefaultFlatRateShippingMethod"/>
-
-            <!--Create simple customer-->
             <createData entity="Simple_US_Customer_CA" stepKey="simpleCustomer"/>
-
-            <!--Create simple product 1-->
             <createData entity="ApiProductWithDescription" stepKey="simple1" before="simple2"/>
-
-            <!--Create simple product 2-->
             <createData entity="ApiProductWithDescription" stepKey="simple2" before="product"/>
-
-            <!--Create bundle product with checkbox bundle option-->
             <createData entity="ApiBundleProduct" stepKey="product"/>
             <createData entity="CheckboxOption" stepKey="checkboxBundleOption">
                 <requiredEntity createDataKey="product"/>
             </createData>
-
-            <!--Link simple product 1 to bundle option with default quantity 2-->
             <createData entity="ApiBundleLink" stepKey="createBundleLink1">
                 <requiredEntity createDataKey="product"/>
                 <requiredEntity createDataKey="checkboxBundleOption"/>
@@ -45,8 +34,6 @@
                 <field key="qty">2</field>
                 <field key="is_default">1</field>
             </createData>
-
-            <!--Link simple product 2 to bundle option with default quantity 2-->
             <createData entity="ApiBundleLink" stepKey="createBundleLink2">
                 <requiredEntity createDataKey="product"/>
                 <requiredEntity createDataKey="checkboxBundleOption"/>
@@ -54,13 +41,9 @@
                 <field key="qty">2</field>
                 <field key="is_default">1</field>
             </createData>
-
-            <!--Add drop-down bundle option-->
             <createData entity="DropDownBundleOption" stepKey="dropDownBundleOption">
                 <requiredEntity createDataKey="product"/>
             </createData>
-
-            <!--Link simple product 1 to drop-down bundle option with default quantity 2-->
             <createData entity="ApiBundleLink" stepKey="createBundleLink3">
                 <requiredEntity createDataKey="product"/>
                 <requiredEntity createDataKey="dropDownBundleOption"/>
@@ -68,8 +51,6 @@
                 <field key="qty">2</field>
                 <field key="is_default">1</field>
             </createData>
-
-            <!--Link simple product 2 to drop-down bundle option with default quantity 2-->
             <createData entity="ApiBundleLink" stepKey="createBundleLink4">
                 <requiredEntity createDataKey="product"/>
                 <requiredEntity createDataKey="dropDownBundleOption"/>
@@ -78,45 +59,30 @@
             </createData>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
         </before>
+        <after>
+            <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
+            <deleteData createDataKey="product" stepKey="delete"/>
+            <deleteData createDataKey="simpleCustomer" stepKey="deleteSimpleCustomer"/>
+            <deleteData createDataKey="simple1" stepKey="deleteSimple1" before="deleteSimple2"/>
+            <deleteData createDataKey="simple2" stepKey="deleteSimple2" before="delete"/>
+        </after>
 
-        <!--Create new customer order-->
         <actionGroup ref="NavigateToNewOrderPageExistingCustomerActionGroup" stepKey="navigateToNewOrderWithExistingCustomer">
             <argument name="customer" value="$$simpleCustomer$$"/>
         </actionGroup>
-
-        <!--Add bundle product to order and check product price in grid-->
         <actionGroup ref="AddBundleProductToOrderAndCheckPriceInGridActionGroup" stepKey="addBundleProductToOrder">
             <argument name="product" value="$$product$$"/>
             <argument name="quantity" value="1"/>
             <argument name="price" value="$738.00"/>
         </actionGroup>
-
-        <!--Select FlatRate shipping method-->
         <actionGroup ref="OrderSelectFlatRateShippingActionGroup" stepKey="orderSelectFlatRateShippingMethod"/>
-
-        <!--Submit order-->
-        <click selector="{{AdminOrderFormActionSection.SubmitOrder}}" stepKey="submitOrder"/>
-
-        <!--Verify order information-->
-        <actionGroup ref="VerifyCreatedOrderInformationActionGroup" stepKey="verifyCreatedOrderInformation"/>
-
-
-        <!-- Create Invoice -->
+        <actionGroup ref="AdminSubmitOrderActionGroup" stepKey="submitOrder"/>
         <actionGroup ref="StartCreateInvoiceFromOrderPageActionGroup" stepKey="startInvoice"/>
-        <click selector="{{AdminInvoiceMainActionsSection.submitInvoice}}" stepKey="clickSubmitInvoice"/>
-        <waitForElementVisible selector="{{AdminMessagesSection.success}}" stepKey="waitForMessageAppears"/>
-        <see selector="{{AdminMessagesSection.success}}" userInput="The invoice has been created." stepKey="seeInvoiceCreateSuccess"/>
-
-        <!-- Go to Sales > Orders > find out placed order and open -->
-        <grabTextFrom selector="|Order # (\d+)|" stepKey="grabOrderId" />
-        <assertNotEmpty stepKey="assertOrderIdIsNotEmpty" after="grabOrderId">
-            <actualResult type="const">$grabOrderId</actualResult>
-        </assertNotEmpty>
+        <actionGroup ref="SubmitInvoiceActionGroup" stepKey="submitInvoice"/>
+        <grabFromCurrentUrl regex="~/order_id/(\d+)/~" stepKey="grabOrderId"/>
         <actionGroup ref="OpenOrderByIdActionGroup" stepKey="openOrder">
-            <argument name="orderId" value="{$grabOrderId}"/>
+            <argument name="orderId" value="$grabOrderId"/>
         </actionGroup>
-
-        <!-- Click 'Credit Memo' button and fill data from dataset: partial refund -->
         <actionGroup ref="AdminOpenAndFillCreditMemoRefundBundleWithQtyActionGroup" stepKey="fillCreditMemoRefund">
             <argument name="itemQtyToRefund" value="0"/>
             <argument name="rowNumberItemOne" value="3"/>
@@ -124,36 +90,15 @@
             <argument name="rowNumberItemThree" value="6"/>
             <argument name="adjustmentRefund" value="10"/>
         </actionGroup>
+        <actionGroup ref="SubmitCreditMemoActionGroup" stepKey="submitCreditMemo" />
 
-        <!-- On order's page click 'Refund offline' button -->
-        <click selector="{{AdminCreditMemoTotalSection.submitRefundOffline}}" stepKey="clickRefundOffline"/>
-        <waitForPageLoad stepKey="waitForResultPage"/>
-
-        <!-- Perform all assertions: assert refund success create message -->
-        <see selector="{{AdminIndexManagementSection.successMessage}}" userInput="You created the credit memo." stepKey="assertRefundSuccessCreateMessage"/>
-
-        <!--Assert refund in Credit Memo Tab -->
-        <click selector="{{AdminOrderDetailsOrderViewSection.creditMemos}}" stepKey="clickCreditMemoTab"/>
-        <waitForPageLoad stepKey="waitForTabLoad"/>
-        <grabTextFrom selector="{{AdminCreditMemosGridSection.memoId}}" stepKey="grabMemoId"/>
-        <assertNotEmpty stepKey="assertMemoIdIsNotEmpty" after="grabMemoId">
-            <actualResult type="const">$grabMemoId</actualResult>
-        </assertNotEmpty>
-        <click selector="{{AdminCreditMemosGridSection.memoId}}" stepKey="clickView"/>
-        <waitForPageLoad stepKey="waitForCreditMemo"/>
+        <actionGroup ref="AdminOpenCreditMemoFromOrderPageActionGroup" stepKey="openCreditMemo" />
         <scrollTo selector="{{AdminCreditMemoViewTotalSection.subtotal}}" stepKey="scrollToTotal"/>
-        <see selector="{{AdminCreditMemoViewTotalSection.subtotal}}" userInput="$0.00" stepKey="seeSubtotal"/>
-        <see selector="{{AdminCreditMemoViewTotalSection.adjustmentRefund}}" userInput="$10.00" stepKey="seeAdjustmentRefund"/>
-        <see selector="{{AdminCreditMemoViewTotalSection.adjustmentFee}}" userInput="$0.00" stepKey="seeAdjustmentFee"/>
-        <see selector="{{AdminCreditMemoViewTotalSection.grandTotal}}" userInput="$10.00" stepKey="assertRefundOnCreditMemoTab"/>
-
-        <after>
-            <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
-
-            <deleteData createDataKey="product" stepKey="delete"/>
-            <deleteData createDataKey="simpleCustomer" stepKey="deleteSimpleCustomer"/>
-            <deleteData createDataKey="simple1" stepKey="deleteSimple1" before="deleteSimple2"/>
-            <deleteData createDataKey="simple2" stepKey="deleteSimple2" before="delete"/>
-        </after>
+        <actionGroup ref="AssertAdminCreditMemoViewPageTotalsActionGroup" stepKey="assertCreditMemoViewPageTotals">
+            <argument name="subtotal" value="$0.00"/>
+            <argument name="adjustmentRefund" value="$10.00"/>
+            <argument name="adjustmentFee" value="$0.00"/>
+            <argument name="grandTotal" value="$10.00"/>
+        </actionGroup>
     </test>
 </tests>
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 13245e3ce2700..4cf571d3b6108 100644
--- a/app/code/Magento/Sales/Test/Unit/Model/Order/CreditmemoFactoryTest.php
+++ b/app/code/Magento/Sales/Test/Unit/Model/Order/CreditmemoFactoryTest.php
@@ -3,74 +3,121 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
 
 namespace Magento\Sales\Test\Unit\Model\Order;
 
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
+use Magento\Sales\Model\Order\CreditmemoFactory;
+use Magento\Sales\Model\Order\Item;
+use PHPUnit\Framework\MockObject\MockObject;
+use PHPUnit\Framework\TestCase;
+use ReflectionMethod;
+
 /**
  * Unit test for creditmemo factory class.
- * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
-class CreditmemoFactoryTest extends \PHPUnit\Framework\TestCase
+class CreditmemoFactoryTest extends TestCase
 {
     /**
-     * Subject of testing.
-     *
-     * @var \Magento\Sales\Model\Order\CreditmemoFactory
+     * @var CreditmemoFactory
      */
     protected $subject;
 
     /**
-     * @return void
-     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
+     * @var ReflectionMethod
      */
-    protected function setUp()
-    {
-        $objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
-        $this->subject = $objectManager->getObject(\Magento\Sales\Model\Order\CreditmemoFactory::class, []);
-    }
+    protected $testMethod;
 
     /**
-     * Check if order item can be refunded
+     * @var Item|MockObject
+     */
+    protected $orderItemMock;
+
+    /**
+     * @var Item|MockObject
+     */
+    protected $orderChildItemOneMock;
+
+    /**
+     * @var Item|MockObject
      */
-    public function testCanRefundItem()
+    protected $orderChildItemTwoMock;
+
+    /**
+     * @inheritDoc
+     */
+    protected function setUp(): void
     {
-        $orderItem = $this->createPartialMock(
-            \Magento\Sales\Model\Order\Item::class,
+        $this->orderItemMock = $this->createPartialMock(
+            Item::class,
             ['getChildrenItems', 'isDummy', 'getHasChildren', 'getId', 'getParentItemId']
         );
-        $orderItem->expects($this->any())
-            ->method('getId')
-            ->willReturn(1);
-        $orderItem->expects($this->any())->method('getParentItemId')->willReturn(false);
-        $orderItem->expects($this->any())->method('isDummy')->willReturn(true);
-        $orderItem->expects($this->any())->method('getHasChildren')->willReturn(true);
-        $orderChildItemOne = $this->createPartialMock(
-            \Magento\Sales\Model\Order\Item::class,
+        $this->orderChildItemOneMock = $this->createPartialMock(
+            Item::class,
             ['getQtyToRefund', 'getId']
         );
-        $orderChildItemOne->expects($this->any())->method('getQtyToRefund')->willReturn(1);
-        $orderChildItemOne->expects($this->any())->method('getId')->willReturn(2);
-        $orderChildItemTwo = $this->createPartialMock(
-            \Magento\Sales\Model\Order\Item::class,
+        $this->orderChildItemTwoMock = $this->createPartialMock(
+            Item::class,
             ['getQtyToRefund', 'getId']
         );
-        $orderChildItemTwo->expects($this->any())->method('getQtyToRefund')->willReturn(1);
-        $orderChildItemTwo->expects($this->any())->method('getId')->willReturn(3);
-        $orderItem->expects($this->any())
-            ->method('getChildrenItems')
-            ->willReturn([$orderChildItemOne, $orderChildItemTwo]);
-        $testMethod = new \ReflectionMethod(
-            \Magento\Sales\Model\Order\CreditmemoFactory::class,
-            'canRefundItem'
-        );
+        $this->testMethod = new ReflectionMethod(CreditmemoFactory::class, 'canRefundItem');
+
+        $objectManagerHelper = new ObjectManagerHelper($this);
+        $this->subject = $objectManagerHelper->getObject(CreditmemoFactory::class, []);
+    }
+
+    /**
+     * Check if order item can be refunded
+     * @return void
+     */
+    public function testCanRefundItem(): void
+    {
         $orderItemQtys = [
             2 => 0,
             3 => 0
         ];
         $invoiceQtysRefundLimits = [];
-        $testMethod->setAccessible(true);
-        $result         = $testMethod->invoke($this->subject, $orderItem, $orderItemQtys, $invoiceQtysRefundLimits);
-        $expectedResult = true;
-        $this->assertEquals($expectedResult, $result);
+
+        $this->orderItemMock->expects($this->any())
+            ->method('getId')
+            ->willReturn(1);
+        $this->orderItemMock->expects($this->any())
+            ->method('getParentItemId')
+            ->willReturn(false);
+        $this->orderItemMock->expects($this->any())
+            ->method('isDummy')
+            ->willReturn(true);
+        $this->orderItemMock->expects($this->any())
+            ->method('getHasChildren')
+            ->willReturn(true);
+
+        $this->orderChildItemOneMock->expects($this->any())
+            ->method('getQtyToRefund')
+            ->willReturn(1);
+        $this->orderChildItemOneMock->expects($this->any())
+            ->method('getId')
+            ->willReturn(2);
+
+        $this->orderChildItemTwoMock->expects($this->any())
+            ->method('getQtyToRefund')
+            ->willReturn(1);
+        $this->orderChildItemTwoMock->expects($this->any())
+            ->method('getId')
+            ->willReturn(3);
+        $this->orderItemMock->expects($this->any())
+            ->method('getChildrenItems')
+            ->willReturn([$this->orderChildItemOneMock, $this->orderChildItemTwoMock]);
+
+        $this->testMethod->setAccessible(true);
+
+        $this->assertTrue(
+            $this->testMethod->invoke(
+                $this->subject,
+                $this->orderItemMock,
+                $orderItemQtys,
+                $invoiceQtysRefundLimits
+            )
+        );
     }
 }

From e38b1a116daf637bb212e8c60603e940bac7a642 Mon Sep 17 00:00:00 2001
From: Lukasz Bajsarowicz <lukasz.bajsarowicz@gmail.com>
Date: Tue, 21 Apr 2020 17:45:03 +0200
Subject: [PATCH 047/120] #27270 Further improvements to @krzkrz PR with
 changes from @sshymko, my change related to reattaching the plugin only to
 Layout and Pages (ancestor of Layout)

---
 .../Controller/Result/JsFooterPlugin.php      | 47 ++++++++++----
 .../Controller/Result/JsFooterPluginTest.php  | 63 ++++++++++---------
 app/code/Magento/Theme/etc/frontend/di.xml    |  4 +-
 3 files changed, 69 insertions(+), 45 deletions(-)

diff --git a/app/code/Magento/Theme/Controller/Result/JsFooterPlugin.php b/app/code/Magento/Theme/Controller/Result/JsFooterPlugin.php
index e0b2d5595bf80..dd490cd02b61c 100644
--- a/app/code/Magento/Theme/Controller/Result/JsFooterPlugin.php
+++ b/app/code/Magento/Theme/Controller/Result/JsFooterPlugin.php
@@ -8,8 +8,10 @@
 namespace Magento\Theme\Controller\Result;
 
 use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Framework\App\Response\HttpInterface as HttpResponseInterface;
+use Magento\Framework\App\ResponseInterface;
+use Magento\Framework\View\Result\Layout;
 use Magento\Store\Model\ScopeInterface;
-use Magento\Framework\App\Response\Http;
 
 /**
  * Plugin for putting all JavaScript tags to the end of body.
@@ -34,26 +36,32 @@ public function __construct(ScopeConfigInterface $scopeConfig)
     /**
      * Moves all JavaScript tags to the end of body if this 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)
+    public function afterRenderResult(Layout $subject, Layout $result, ResponseInterface $httpResponse)
     {
-        $content = (string)$subject->getContent();
+        if (!$this->isDeferEnabled()) {
+            return $result;
+        }
+
+        $content = (string)$httpResponse->getContent();
         $bodyEndTag = '</body';
-        $isEndBodyTagFound = strpos($content, $bodyEndTag) !== false;
-        $shouldMoveJsToBottom = $this->scopeConfig->isSetFlag(
-            self::XML_PATH_DEV_MOVE_JS_TO_BOTTOM,
-            ScopeInterface::SCOPE_STORE
-        );
+        $bodyEndTagFound = strrpos($content, $bodyEndTag) !== false;
 
-        if ($isEndBodyTagFound && $shouldMoveJsToBottom) {
+        if ($bodyEndTagFound) {
             $scripts = $this->extractScriptTags($content);
             if ($scripts) {
-                $content = str_replace($bodyEndTag, "$scripts\n$bodyEndTag", $content);
-                $subject->setContent($content);
+                $newBodyEndTagPosition = strrpos($content, $bodyEndTag);
+                $content = substr_replace($content, $scripts . "\n", $newBodyEndTagPosition, 0);
+                $httpResponse->setContent($content);
             }
         }
+
+        return $result;
     }
 
     /**
@@ -86,4 +94,17 @@ private function extractScriptTags(&$content): string
 
         return $scripts;
     }
+
+    /**
+     * Returns information whether moving JS to footer is enabled
+     *
+     * @return bool
+     */
+    private function isDeferEnabled(): bool
+    {
+        return $this->scopeConfig->isSetFlag(
+            self::XML_PATH_DEV_MOVE_JS_TO_BOTTOM,
+            ScopeInterface::SCOPE_STORE
+        );
+    }
 }
diff --git a/app/code/Magento/Theme/Test/Unit/Controller/Result/JsFooterPluginTest.php b/app/code/Magento/Theme/Test/Unit/Controller/Result/JsFooterPluginTest.php
index 3175dc1deb867..943ef9f4b5000 100644
--- a/app/code/Magento/Theme/Test/Unit/Controller/Result/JsFooterPluginTest.php
+++ b/app/code/Magento/Theme/Test/Unit/Controller/Result/JsFooterPluginTest.php
@@ -7,13 +7,14 @@
 
 namespace Magento\Theme\Test\Unit\Controller\Result;
 
-use Magento\Theme\Controller\Result\JsFooterPlugin;
-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\App\Response\Http;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
+use Magento\Framework\View\Result\Layout;
+use Magento\Store\Model\ScopeInterface;
+use Magento\Theme\Controller\Result\JsFooterPlugin;
+use PHPUnit\Framework\MockObject\MockObject;
+use PHPUnit\Framework\TestCase;
 
 /**
  * Unit test for Magento\Theme\Test\Unit\Controller\Result\JsFooterPlugin.
@@ -22,21 +23,18 @@ class JsFooterPluginTest extends TestCase
 {
     const STUB_XML_PATH_DEV_MOVE_JS_TO_BOTTOM = 'dev/js/move_script_to_bottom';
 
-    /**
-     * @var JsFooterPlugin
-     */
+    /** @var JsFooterPlugin */
     private $plugin;
 
-    /**
-     * @var ScopeConfigInterface|MockObject
-     */
+    /** @var ScopeConfigInterface|MockObject */
     private $scopeConfigMock;
 
-    /**
-     * @var Http|MockObject
-     */
+    /** @var Http|MockObject */
     private $httpMock;
 
+    /** @var Layout|MockObject */
+    private $layoutMock;
+
     /**
      * @inheritdoc
      */
@@ -48,6 +46,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,11 +58,11 @@ protected function setUp(): void
     }
 
     /**
-     * Data Provider for testBeforeSendResponse()
+     * Data Provider for testAfterRenderResult()
      *
      * @return array
      */
-    public function sendResponseDataProvider(): array
+    public function renderResultDataProvider(): array
     {
         return [
             'content_with_script_tag' => [
@@ -98,31 +97,29 @@ public function sendResponseDataProvider(): array
      * @param bool $isSetFlag
      * @param string $result
      * @return void
-     * @dataProvider sendResponseDataProvider
+     * @dataProvider renderResultDataProvider
      */
-    public function testBeforeSendResponse($content, $isSetFlag, $result): void
+    public function testAfterRenderResult($content, $isSetFlag, $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_DEV_MOVE_JS_TO_BOTTOM,
-                ScopeInterface::SCOPE_STORE
-            )
+        $this->scopeConfigMock->method('isSetFlag')
+            ->with(self::STUB_XML_PATH_DEV_MOVE_JS_TO_BOTTOM, 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);
     }
 
     /**
-     * Data Provider for testBeforeSendResponseIfGetContentIsNotAString()
+     * Data Provider for testAfterRenderResultIfGetContentIsNotAString()
      *
      * @return array
      */
@@ -136,14 +133,18 @@ public function ifGetContentIsNotAStringDataProvider(): array
     }
 
     /**
-     * Test BeforeSendResponse if content is not a string
+     * Test AfterRenderResult if content is not a string
      *
      * @param string $content
      * @return void
      * @dataProvider ifGetContentIsNotAStringDataProvider
      */
-    public function testBeforeSendResponseIfGetContentIsNotAString($content): void
+    public function testAfterRenderResultIfGetContentIsNotAString($content): void
     {
+        $this->scopeConfigMock->method('isSetFlag')
+            ->with(self::STUB_XML_PATH_DEV_MOVE_JS_TO_BOTTOM, ScopeInterface::SCOPE_STORE)
+            ->willReturn(true);
+
         $this->httpMock->expects($this->once())
             ->method('getContent')
             ->willReturn($content);
@@ -151,6 +152,6 @@ public function testBeforeSendResponseIfGetContentIsNotAString($content): void
         $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 310f4a717c294..915765de7be68 100644
--- a/app/code/Magento/Theme/etc/frontend/di.xml
+++ b/app/code/Magento/Theme/etc/frontend/di.xml
@@ -27,9 +27,11 @@
         <plugin name="result-messages" type="Magento\Theme\Controller\Result\MessagePlugin"/>
     </type>
     <type name="Magento\Framework\App\Response\Http">
-        <plugin name="result-js-footer" type="Magento\Theme\Controller\Result\JsFooterPlugin"/>
         <plugin name="asyncCssLoad" type="Magento\Theme\Controller\Result\AsyncCssPlugin"/>
     </type>
+    <type name="Magento\Framework\View\Result\Layout">
+        <plugin name="result-js-footer" type="Magento\Theme\Controller\Result\JsFooterPlugin"/>
+    </type>
     <type name="Magento\Theme\Block\Html\Header\CriticalCss">
         <arguments>
             <argument name="filePath" xsi:type="string">css/critical.css</argument>

From 10671669bdf5f7455ccb64bc62d6b05db510242d Mon Sep 17 00:00:00 2001
From: Roman Lytvynenko <lytvynen@adobe.com>
Date: Tue, 28 Apr 2020 09:15:57 -0500
Subject: [PATCH 048/120] MC-33700: TransportBuilder unable to send emails of
 Content-Type "text/plain"

---
 .../Mail/Template/TransportBuilder.php          | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/lib/internal/Magento/Framework/Mail/Template/TransportBuilder.php b/lib/internal/Magento/Framework/Mail/Template/TransportBuilder.php
index c423d6ec627bb..234dccf8c9046 100644
--- a/lib/internal/Magento/Framework/Mail/Template/TransportBuilder.php
+++ b/lib/internal/Magento/Framework/Mail/Template/TransportBuilder.php
@@ -12,9 +12,8 @@
 use Magento\Framework\App\TemplateTypesInterface;
 use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\Exception\MailException;
-use Magento\Framework\Mail\EmailMessageInterface;
-use Magento\Framework\Mail\EmailMessageInterfaceFactory;
 use Magento\Framework\Mail\AddressConverter;
+use Magento\Framework\Mail\EmailMessageInterfaceFactory;
 use Magento\Framework\Mail\Exception\InvalidArgumentException;
 use Magento\Framework\Mail\MessageInterface;
 use Magento\Framework\Mail\MessageInterfaceFactory;
@@ -28,7 +27,7 @@
 use Magento\Framework\Phrase;
 
 /**
- * TransportBuilder
+ * TransportBuilder for Mail Templates
  *
  * @api
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
@@ -380,11 +379,11 @@ protected function prepareMessage()
 
         switch ($template->getType()) {
             case TemplateTypesInterface::TYPE_TEXT:
-                $part['type'] = MimeInterface::TYPE_TEXT;
+                $partType = MimeInterface::TYPE_TEXT;
                 break;
 
             case TemplateTypesInterface::TYPE_HTML:
-                $part['type'] = MimeInterface::TYPE_HTML;
+                $partType = MimeInterface::TYPE_HTML;
                 break;
 
             default:
@@ -395,10 +394,10 @@ protected function prepareMessage()
 
         /** @var \Magento\Framework\Mail\MimePartInterface $mimePart */
         $mimePart = $this->mimePartInterfaceFactory->create(
-        	[
-        		'content' => $content,
-        		'type' => $part['type']
-        	]
+            [
+                'content' => $content,
+                'type' => $partType
+            ]
         );
         $this->messageData['encoding'] = $mimePart->getCharset();
         $this->messageData['body'] = $this->mimeMessageInterfaceFactory->create(

From 465bfa18d272661b08e5e8aa0de2c039e6296cbc Mon Sep 17 00:00:00 2001
From: Roman Lytvynenko <lytvynen@adobe.com>
Date: Tue, 28 Apr 2020 09:57:09 -0500
Subject: [PATCH 049/120] MC-33700: TransportBuilder unable to send emails of
 Content-Type "text/plain"

---
 .../Framework/Mail/TransportBuilderTest.php   | 27 ++++++++++++++++---
 1 file changed, 23 insertions(+), 4 deletions(-)

diff --git a/dev/tests/integration/testsuite/Magento/Framework/Mail/TransportBuilderTest.php b/dev/tests/integration/testsuite/Magento/Framework/Mail/TransportBuilderTest.php
index 03bdc9a365526..bf2c8befe2f71 100644
--- a/dev/tests/integration/testsuite/Magento/Framework/Mail/TransportBuilderTest.php
+++ b/dev/tests/integration/testsuite/Magento/Framework/Mail/TransportBuilderTest.php
@@ -9,6 +9,8 @@
 
 use Magento\Email\Model\BackendTemplate;
 use Magento\Email\Model\Template;
+use Magento\Framework\App\TemplateTypesInterface;
+use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\Mail\Template\TransportBuilder;
 use Magento\Framework\ObjectManagerInterface;
 use Magento\TestFramework\Helper\Bootstrap;
@@ -47,11 +49,26 @@ protected function setUp()
      *
      * @param string|array $email
      * @dataProvider emailDataProvider
-     * @throws \Magento\Framework\Exception\LocalizedException
+     * @throws LocalizedException
      */
     public function testAddToEmail($email)
     {
-        $templateId = $this->template->load('email_exception_fixture', 'template_code')->getId();
+        $template = $this->template->load('email_exception_fixture', 'template_code');
+        $templateId = $template->getId();
+
+        switch ($template->getType()) {
+            case TemplateTypesInterface::TYPE_TEXT:
+                $templateType = MimeInterface::TYPE_TEXT;
+                break;
+
+            case TemplateTypesInterface::TYPE_HTML:
+                $templateType = MimeInterface::TYPE_HTML;
+                break;
+
+            default:
+                $templateType = '';
+                $this->fail('Unsupported Mime Type');
+        }
 
         $this->builder->setTemplateModel(BackendTemplate::class);
 
@@ -62,9 +79,11 @@ public function testAddToEmail($email)
         $this->builder->addTo($email);
 
         /** @var EmailMessage $emailMessage */
-        $emailMessage = $this->builder->getTransport();
+        $emailMessage = $this->builder->getTransport()->getMessage();
+
+        $this->assertContains($templateType, $emailMessage->getHeaders()['Content-Type']);
 
-        $addresses = $emailMessage->getMessage()->getTo();
+        $addresses = $emailMessage->getTo();
 
         $emails = [];
         /** @var Address $toAddress */

From 321f5c1aed364f72eed6e5e08696f88f4ceabcac Mon Sep 17 00:00:00 2001
From: Tu Nguyen <ladiesman9x@gmail.com>
Date: Wed, 29 Apr 2020 11:19:50 +0700
Subject: [PATCH 050/120] Fix icon not change when attribute properties
 fieldset opened

---
 .../web/css/source/module/main/_collapsible-blocks.less      | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/main/_collapsible-blocks.less b/app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/main/_collapsible-blocks.less
index 51a939cae1a5f..bdc986e918c2c 100644
--- a/app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/main/_collapsible-blocks.less
+++ b/app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/main/_collapsible-blocks.less
@@ -122,11 +122,6 @@
                 &:before {
                     content: @icon-expand-close__content;
                 }
-                &.active {
-                    &:before {
-                        content: @icon-expand-open__content;
-                    }
-                }
             }
         }
 

From 13fe206df162eb2e9f807659899bbe2462142d51 Mon Sep 17 00:00:00 2001
From: Tu Nguyen <ladiesman9x@gmail.com>
Date: Wed, 29 Apr 2020 13:39:26 +0700
Subject: [PATCH 051/120] update changes

---
 .../web/css/source/module/main/_collapsible-blocks.less     | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/main/_collapsible-blocks.less b/app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/main/_collapsible-blocks.less
index bdc986e918c2c..c731b9268260b 100644
--- a/app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/main/_collapsible-blocks.less
+++ b/app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/main/_collapsible-blocks.less
@@ -122,6 +122,12 @@
                 &:before {
                     content: @icon-expand-close__content;
                 }
+
+                &.active {
+                    &:before {
+                        content: @icon-expand-close__content;
+                    }
+                }
             }
         }
 

From 18a92dd3bec94fd22371e10a62a1b196f8036137 Mon Sep 17 00:00:00 2001
From: Ajith <ajithkumar.maragathavel@ziffity.com>
Date: Wed, 29 Apr 2020 16:46:17 +0530
Subject: [PATCH 052/120] StorefrontLoginWithIncorrectCredentialsTest
 refactored using MFTF best practices

---
 ...StorefrontLoginWithIncorrectCredentialsTest.xml | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/app/code/Magento/Customer/Test/Mftf/Test/StorefrontLoginWithIncorrectCredentialsTest.xml b/app/code/Magento/Customer/Test/Mftf/Test/StorefrontLoginWithIncorrectCredentialsTest.xml
index 104b5d56314ba..a7dc3c7fde7f4 100644
--- a/app/code/Magento/Customer/Test/Mftf/Test/StorefrontLoginWithIncorrectCredentialsTest.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Test/StorefrontLoginWithIncorrectCredentialsTest.xml
@@ -26,10 +26,14 @@
             <deleteData stepKey="deleteCustomer" createDataKey="customer" />
         </after>
 
-        <amOnPage stepKey="amOnSignInPage"  url="{{StorefrontCustomerSignInPage.url}}"/>
-        <fillField  stepKey="fillEmail" userInput="$$customer.email$$" selector="{{StorefrontCustomerSignInFormSection.emailField}}"/>
-        <fillField  stepKey="fillPassword" userInput="$$customer.password$$INVALID" selector="{{StorefrontCustomerSignInFormSection.passwordField}}"/>
-        <click stepKey="clickSignInAccountButton" selector="{{StorefrontCustomerSignInFormSection.signInAccountButton}}"/>
-        <see stepKey="seeErrorMessage" selector="{{StorefrontCustomerLoginMessagesSection.errorMessage}}" userInput="The account sign-in was incorrect or your account is disabled temporarily. Please wait and try again later."/>
+        <actionGroup ref="StorefrontOpenCustomerLoginPageActionGroup" stepKey="goToSignInPage"/>
+        <actionGroup ref="StorefrontFillCustomerLoginFormWithWrongPasswordActionGroup" stepKey="fillLoginFormWithCustomerData">
+            <argument name="customer" value="$$customer$$"/>
+        </actionGroup>
+        <actionGroup ref="StorefrontClickSignOnCustomerLoginFormActionGroup" stepKey="clickSignInAccountButtonFirstAttempt"/>
+        <actionGroup ref="AssertMessageCustomerLoginActionGroup" stepKey="seeErrorMessageAfterFirstAttempt">
+            <argument name="messageType" value="error"/>
+            <argument name="message" value="The account sign-in was incorrect or your account is disabled temporarily. Please wait and try again later"/>
+        </actionGroup>
     </test>
 </tests>

From a8ff59ae2837d8a58111e7438eb1303f095c5d02 Mon Sep 17 00:00:00 2001
From: Roman Lytvynenko <lytvynen@adobe.com>
Date: Wed, 29 Apr 2020 09:16:06 -0500
Subject: [PATCH 053/120] MC-33700: TransportBuilder unable to send emails of
 Content-Type "text/plain"

---
 .../Email/view/adminhtml/templates/template/edit.phtml        | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

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..7941f41fb90e0 100644
--- a/app/code/Magento/Email/view/adminhtml/templates/template/edit.phtml
+++ b/app/code/Magento/Email/view/adminhtml/templates/template/edit.phtml
@@ -114,6 +114,8 @@ require([
         },
 
         stripTags: function () {
+            var self = this;
+
             confirm({
                 content: "<?= $block->escapeJs($block->escapeHtml(__('Are you sure you want to strip tags?'))) ?>",
                 actions: {
@@ -125,7 +127,7 @@ require([
                         ).stripTags().strip();
                         $('convert_button_back').show();
                         $('field_template_styles').hide();
-                        this.typeChange = true;
+                        self.typeChange = true;
                         return false;
                     }
                 }

From 2288eaee8dc5280f168fc51187ff3c5ae91233a5 Mon Sep 17 00:00:00 2001
From: Roman Lytvynenko <lytvynen@adobe.com>
Date: Wed, 29 Apr 2020 10:00:42 -0500
Subject: [PATCH 054/120] MC-33700: TransportBuilder unable to send emails of
 Content-Type "text/plain"

---
 .../view/adminhtml/templates/template/edit.phtml     | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

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 7941f41fb90e0..21d7bb3c713c7 100644
--- a/app/code/Magento/Email/view/adminhtml/templates/template/edit.phtml
+++ b/app/code/Magento/Email/view/adminhtml/templates/template/edit.phtml
@@ -6,9 +6,11 @@
 
 use Magento\Framework\App\TemplateTypesInterface;
 
+// phpcs:disable Magento2.Files.LineLength
+
 /** @var $block \Magento\Email\Block\Adminhtml\Template\Edit */
 ?>
-<?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">
@@ -17,14 +19,14 @@ use Magento\Framework\App\TemplateTypesInterface;
             <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) : ?>
+                        <?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; ?>

From 2de79c84c36129616c3383fc8f1dfc1600955795 Mon Sep 17 00:00:00 2001
From: Roman Lytvynenko <lytvynen@adobe.com>
Date: Wed, 29 Apr 2020 10:41:24 -0500
Subject: [PATCH 055/120] MC-33700: TransportBuilder unable to send emails of
 Content-Type "text/plain"

---
 .../Magento/Email/view/adminhtml/templates/template/edit.phtml  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 21d7bb3c713c7..0dceb9d51a99e 100644
--- a/app/code/Magento/Email/view/adminhtml/templates/template/edit.phtml
+++ b/app/code/Magento/Email/view/adminhtml/templates/template/edit.phtml
@@ -6,7 +6,7 @@
 
 use Magento\Framework\App\TemplateTypesInterface;
 
-// phpcs:disable Magento2.Files.LineLength
+// phpcs:disable Generic.Files.LineLength.TooLong
 
 /** @var $block \Magento\Email\Block\Adminhtml\Template\Edit */
 ?>

From aae2b7f2073dd171fa12388348bef1a37e389c46 Mon Sep 17 00:00:00 2001
From: Tu Nguyen <ladiesman9x@gmail.com>
Date: Thu, 30 Apr 2020 10:25:00 +0700
Subject: [PATCH 056/120] Update fix class active collapse block

---
 .../web/template/variations/steps/summary-grid.html         | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/code/Magento/ConfigurableProduct/view/adminhtml/web/template/variations/steps/summary-grid.html b/app/code/Magento/ConfigurableProduct/view/adminhtml/web/template/variations/steps/summary-grid.html
index ff247c14bf52b..bf1e1ad5fe1e1 100644
--- a/app/code/Magento/ConfigurableProduct/view/adminhtml/web/template/variations/steps/summary-grid.html
+++ b/app/code/Magento/ConfigurableProduct/view/adminhtml/web/template/variations/steps/summary-grid.html
@@ -5,14 +5,14 @@
  */
 -->
 
-<div class="admin__collapsible-block-wrapper opened">
-    <div class="fieldset-wrapper-title">
+<div class="fieldset-wrapper admin__collapsible-block-wrapper opened" data-bind="mageInit: {'collapsible':{'active':true,'openedState':'opened'}}">
+    <div class="fieldset-wrapper-title toggle" data-role="title">
         <strong class="admin__collapsible-title" data-toggle="collapse" data-bind="attr:{'data-target': '#'+id}">
             <span data-bind="text: title"></span>
         </strong>
     </div>
 
-    <div class="fieldset-wrapper-content in collapse" data-collapsed="true" data-bind="attr: {id: id}">
+    <div class="fieldset-wrapper-content in collapse" data-role="content" data-collapsed="true" data-bind="attr: {id: id}">
         <!-- ko template: {
             name: "ui/grid/paging/paging", data: paging
             } -->

From a6f0bf65fded57cae02c69a9c18bf28ca1012d4d Mon Sep 17 00:00:00 2001
From: Nikita Shcherbatykh <nikita.shcherbatykh@transoftgroup.com>
Date: Thu, 30 Apr 2020 14:46:42 +0300
Subject: [PATCH 057/120] MC-25184: The cross-sell products block does not work
 correctly in EE version.

---
 .../Magento/Checkout/Block/Cart/Crosssell.php | 177 +++++++--
 .../Test/Unit/Block/Cart/CrosssellTest.php    | 350 ++++++++++++++++++
 2 files changed, 500 insertions(+), 27 deletions(-)
 create mode 100644 app/code/Magento/Checkout/Test/Unit/Block/Cart/CrosssellTest.php

diff --git a/app/code/Magento/Checkout/Block/Cart/Crosssell.php b/app/code/Magento/Checkout/Block/Cart/Crosssell.php
index 06be50d05aefc..99408003b981b 100644
--- a/app/code/Magento/Checkout/Block/Cart/Crosssell.php
+++ b/app/code/Magento/Checkout/Block/Cart/Crosssell.php
@@ -5,15 +5,29 @@
  */
 namespace Magento\Checkout\Block\Cart;
 
+use Magento\Catalog\Api\Data\ProductInterface;
+use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Catalog\Block\Product\AbstractProduct;
+use Magento\Catalog\Block\Product\Context;
+use Magento\Catalog\Model\Product;
+use Magento\Catalog\Model\Product\LinkFactory;
+use Magento\Catalog\Model\Product\Visibility;
+use Magento\Catalog\Model\ResourceModel\Product\Collection;
+use Magento\Catalog\Model\ResourceModel\Product\CollectionFactory;
 use Magento\CatalogInventory\Helper\Stock as StockHelper;
+use Magento\Checkout\Model\Session;
+use Magento\Framework\App\ObjectManager;
+use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\Quote\Model\Quote\Item\RelatedProducts;
 
 /**
  * Cart crosssell list
  *
  * @api
  * @author      Magento Core Team <core@magentocommerce.com>
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
-class Crosssell extends \Magento\Catalog\Block\Product\AbstractProduct
+class Crosssell extends AbstractProduct
 {
     /**
      * Items quantity will be capped to this value
@@ -23,12 +37,12 @@ class Crosssell extends \Magento\Catalog\Block\Product\AbstractProduct
     protected $_maxItemCount = 4;
 
     /**
-     * @var \Magento\Checkout\Model\Session
+     * @var Session
      */
     protected $_checkoutSession;
 
     /**
-     * @var \Magento\Catalog\Model\Product\Visibility
+     * @var Visibility
      */
     protected $_productVisibility;
 
@@ -38,35 +52,53 @@ class Crosssell extends \Magento\Catalog\Block\Product\AbstractProduct
     protected $stockHelper;
 
     /**
-     * @var \Magento\Catalog\Model\Product\LinkFactory
+     * @var LinkFactory
      */
     protected $_productLinkFactory;
 
     /**
-     * @var \Magento\Quote\Model\Quote\Item\RelatedProducts
+     * @var RelatedProducts
      */
     protected $_itemRelationsList;
 
     /**
-     * @param \Magento\Catalog\Block\Product\Context $context
-     * @param \Magento\Checkout\Model\Session $checkoutSession
-     * @param \Magento\Catalog\Model\Product\Visibility $productVisibility
-     * @param \Magento\Catalog\Model\Product\LinkFactory $productLinkFactory
-     * @param \Magento\Quote\Model\Quote\Item\RelatedProducts $itemRelationsList
+     * @var CollectionFactory|null
+     */
+    private $productCollectionFactory;
+
+    /**
+     * @var ProductRepositoryInterface|null
+     */
+    private $productRepository;
+
+    /**
+     * @var Product[]
+     */
+    private $cartProducts;
+
+    /**
+     * @param Context $context
+     * @param Session $checkoutSession
+     * @param Visibility $productVisibility
+     * @param LinkFactory $productLinkFactory
+     * @param RelatedProducts $itemRelationsList
      * @param StockHelper $stockHelper
      * @param array $data
-     *
+     * @param CollectionFactory|null $productCollectionFactory
+     * @param ProductRepositoryInterface|null $productRepository
      * @codeCoverageIgnore
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
-        \Magento\Catalog\Block\Product\Context $context,
-        \Magento\Checkout\Model\Session $checkoutSession,
-        \Magento\Catalog\Model\Product\Visibility $productVisibility,
-        \Magento\Catalog\Model\Product\LinkFactory $productLinkFactory,
-        \Magento\Quote\Model\Quote\Item\RelatedProducts $itemRelationsList,
+        Context $context,
+        Session $checkoutSession,
+        Visibility $productVisibility,
+        LinkFactory $productLinkFactory,
+        RelatedProducts $itemRelationsList,
         StockHelper $stockHelper,
-        array $data = []
+        array $data = [],
+        ?CollectionFactory $productCollectionFactory = null,
+        ?ProductRepositoryInterface $productRepository = null
     ) {
         $this->_checkoutSession = $checkoutSession;
         $this->_productVisibility = $productVisibility;
@@ -78,6 +110,10 @@ public function __construct(
             $data
         );
         $this->_isScopePrivate = true;
+        $this->productCollectionFactory = $productCollectionFactory
+            ?? ObjectManager::getInstance()->get(CollectionFactory::class);
+        $this->productRepository = $productRepository
+            ?? ObjectManager::getInstance()->get(ProductRepositoryInterface::class);
     }
 
     /**
@@ -92,9 +128,10 @@ public function getItems()
             $items = [];
             $ninProductIds = $this->_getCartProductIds();
             if ($ninProductIds) {
-                $lastAdded = (int)$this->_getLastAddedProductId();
-                if ($lastAdded) {
-                    $collection = $this->_getCollection()->addProductFilter($lastAdded);
+                $lastAddedProduct = $this->getLastAddedProduct();
+                if ($lastAddedProduct) {
+                    $collection = $this->_getCollection()
+                        ->addProductFilter($lastAddedProduct->getData($this->getProductLinkField()));
                     if (!empty($ninProductIds)) {
                         $collection->addExcludeProductFilter($ninProductIds);
                     }
@@ -108,8 +145,8 @@ public function getItems()
 
                 if (count($items) < $this->_maxItemCount) {
                     $filterProductIds = array_merge(
-                        $this->_getCartProductIds(),
-                        $this->_itemRelationsList->getRelatedProductIds($this->getQuote()->getAllItems())
+                        $this->getCartProductLinkIds(),
+                        $this->getCartRelatedProductLinkIds()
                     );
                     $collection = $this->_getCollection()->addProductFilter(
                         $filterProductIds
@@ -150,11 +187,8 @@ protected function _getCartProductIds()
         $ids = $this->getData('_cart_product_ids');
         if ($ids === null) {
             $ids = [];
-            foreach ($this->getQuote()->getAllItems() as $item) {
-                $product = $item->getProduct();
-                if ($product) {
-                    $ids[] = $product->getId();
-                }
+            foreach ($this->getCartProducts() as $product) {
+                $ids[] = $product->getId();
             }
             $this->setData('_cart_product_ids', $ids);
         }
@@ -202,4 +236,93 @@ protected function _getCollection()
 
         return $collection;
     }
+
+    /**
+     * Get product link ID field
+     *
+     * @return string
+     */
+    private function getProductLinkField(): string
+    {
+        /* @var $collection Collection */
+        $collection = $this->productCollectionFactory->create();
+        return $collection->getProductEntityMetadata()->getLinkField();
+    }
+
+    /**
+     * Get cart products link IDs
+     *
+     * @return array
+     */
+    private function getCartProductLinkIds(): array
+    {
+        $linkField = $this->getProductLinkField();
+        $linkIds = [];
+        foreach ($this->getCartProducts() as $product) {
+            /** * @var Product $product */
+            $linkIds[] = $product->getData($linkField);
+        }
+        return $linkIds;
+    }
+
+    /**
+     * Get cart related products link IDs
+     *
+     * @return array
+     */
+    private function getCartRelatedProductLinkIds(): array
+    {
+        $productIds = $this->_itemRelationsList->getRelatedProductIds($this->getQuote()->getAllItems());
+        $linkIds = [];
+        if (!empty($productIds)) {
+            $linkField = $this->getProductLinkField();
+            /* @var $collection Collection */
+            $collection = $this->productCollectionFactory->create();
+            $collection->addIdFilter($productIds);
+            foreach ($collection as $product) {
+                /** * @var Product $product */
+                $linkIds[] = $product->getData($linkField);
+            }
+        }
+        return $linkIds;
+    }
+
+    /**
+     * Retrieve just added to cart product object
+     *
+     * @return ProductInterface|null
+     */
+    private function getLastAddedProduct(): ?ProductInterface
+    {
+        $product = null;
+        $productId = $this->_getLastAddedProductId();
+        if ($productId) {
+            try {
+                $product = $this->productRepository->getById($productId);
+            } catch (NoSuchEntityException $e) {
+                $product = null;
+            }
+        }
+        return $product;
+    }
+
+    /**
+     * Retrieve Array of Product instances in Cart
+     *
+     * @return array
+     */
+    private function getCartProducts(): array
+    {
+        if ($this->cartProducts === null) {
+            $this->cartProducts = [];
+            foreach ($this->getQuote()->getAllItems() as $quoteItem) {
+                /* @var $quoteItem \Magento\Quote\Model\Quote\Item */
+                $product = $quoteItem->getProduct();
+                if ($product) {
+                    $this->cartProducts[$product->getEntityId()] = $product;
+                }
+            }
+        }
+        return $this->cartProducts;
+    }
 }
diff --git a/app/code/Magento/Checkout/Test/Unit/Block/Cart/CrosssellTest.php b/app/code/Magento/Checkout/Test/Unit/Block/Cart/CrosssellTest.php
new file mode 100644
index 0000000000000..b2535dcc3a9b1
--- /dev/null
+++ b/app/code/Magento/Checkout/Test/Unit/Block/Cart/CrosssellTest.php
@@ -0,0 +1,350 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Checkout\Test\Unit\Block\Cart;
+
+use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Catalog\Block\Product\Context;
+use Magento\Catalog\Model\Product;
+use Magento\Catalog\Model\Product\Link;
+use Magento\Catalog\Model\Product\LinkFactory;
+use Magento\Catalog\Model\ResourceModel\Product\CollectionFactory;
+use Magento\Catalog\Model\ResourceModel\Product\Link\Product\Collection;
+use Magento\Checkout\Block\Cart\Crosssell;
+use Magento\Checkout\Model\Session;
+use Magento\Framework\DataObject;
+use Magento\Framework\DB\Select;
+use Magento\Framework\EntityManager\EntityMetadataInterface;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use Magento\Store\Api\Data\StoreInterface;
+use Magento\Store\Model\StoreManagerInterface;
+use PHPUnit\Framework\MockObject\MockObject;
+use PHPUnit\Framework\TestCase;
+
+/**
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
+class CrosssellTest extends TestCase
+{
+    /**
+     * @var Session|MockObject
+     */
+    private $checkoutSession;
+    /**
+     * @var Crosssell
+     */
+    private $model;
+    /**
+     * @var ProductRepositoryInterface|MockObject
+     */
+    private $productRepository;
+    /**
+     * @var LinkFactory|MockObject
+     */
+    private $productLinkFactory;
+    /**
+     * @var array
+     */
+    private $productLinks = [];
+    /**
+     * @var Context
+     */
+    private $context;
+    /**
+     * @var StoreManagerInterface|MockObject
+     */
+    private $storeManager;
+    /**
+     * @var MockObject
+     */
+    private $productCollectionFactory;
+
+    /**
+     * @inheritDoc
+     */
+    protected function setUp()
+    {
+        $objectManager = new ObjectManager($this);
+        $this->storeManager = $this->createMock(
+            StoreManagerInterface::class
+        );
+        $this->context = $objectManager->getObject(
+            Context::class,
+            [
+                'storeManager' => $this->storeManager
+            ]
+        );
+        $this->checkoutSession = $this->createPartialMock(
+            Session::class,
+            [
+                'getQuote',
+                'getLastAddedProductId'
+            ]
+        );
+        $this->productRepository = $this->createMock(
+            ProductRepositoryInterface::class
+        );
+        $this->productLinkFactory = $this->createMock(
+            LinkFactory::class
+        );
+        $this->productLinkFactory = $this->createMock(
+            LinkFactory::class
+        );
+        $this->productCollectionFactory = $this->createMock(
+            CollectionFactory::class
+        );
+        $this->model = $objectManager->getObject(
+            Crosssell::class,
+            [
+                'context' => $this->context,
+                'checkoutSession' => $this->checkoutSession,
+                'productRepository' => $this->productRepository,
+                'productLinkFactory' => $this->productLinkFactory,
+                'productCollectionFactory' => $this->productCollectionFactory,
+            ]
+        );
+    }
+
+    /**
+     * @dataProvider getItemsDataProvider
+     * @param array $productLinks
+     * @param array $cartProductIds
+     * @param int|null $lastAddedProductId
+     * @param array $expected
+     */
+    public function testGetItems(
+        array $productLinks,
+        array $cartProductIds,
+        ?int $lastAddedProductId,
+        array $expected
+    ) {
+        $this->productLinks = $productLinks;
+        $cartProducts = array_map(
+            function ($id) {
+                return $this->getProduct(['entity_id' => $id]);
+            },
+            $cartProductIds
+        );
+        $cartItems = array_map(
+            function ($product) {
+                return new DataObject(['product' => $product]);
+            },
+            $cartProducts
+        );
+        $quote = new DataObject(['all_items' => $cartItems]);
+        $this->checkoutSession->method('getQuote')
+            ->willReturn($quote);
+        $this->checkoutSession->method('getLastAddedProductId')
+            ->willReturn($lastAddedProductId);
+        $this->productRepository->method('getById')
+            ->willReturnCallback(
+                function ($id) {
+                    return $this->getProduct(['entity_id' => $id]);
+                }
+            );
+        $link = $this->createMock(Link::class);
+        $this->productLinkFactory->method('create')
+            ->willReturn($link);
+        $link->method('useCrossSellLinks')
+            ->willReturnSelf();
+        $link->method('getProductCollection')
+            ->willReturnCallback(
+                function () {
+                    return $this->createLinkCollection();
+                }
+            );
+        $this->productCollectionFactory->method('create')
+            ->willReturnCallback(
+                function () {
+                    return $this->createProductCollection();
+                }
+            );
+        $store = $this->createMock(StoreInterface::class);
+        $this->storeManager->method('getStore')
+            ->willReturn($store);
+        $actual = array_map(
+            function ($product) {
+                return $product->getId();
+            },
+            $this->model->getItems()
+        );
+        $this->assertEquals($expected, $actual);
+    }
+
+    /**
+     * @return array
+     */
+    public function getItemsDataProvider(): array
+    {
+        $links = [
+            1001 => [
+                1003,
+                1005
+            ],
+            1006 => [
+                1002,
+            ]
+        ];
+        return [
+            [
+                'productLinks' => $links,
+                'cartProducts' => [
+                    1001,
+                    1006,
+                ],
+                'lastAddedProduct' => 1006,
+                'cross-sells' => [
+                    1002,
+                    1003,
+                    1005
+                ]
+            ],
+            [
+                'productLinks' => $links,
+                'cartProducts' => [
+                    1001,
+                    1006,
+                ],
+                'lastAddedProduct' => null,
+                'cross-sells' => [
+                    1003,
+                    1005,
+                    1002,
+                ]
+            ],
+            [
+                'productLinks' => $links,
+                'cartProducts' => [
+                    1001,
+                    1005,
+                ],
+                'lastAddedProduct' => null,
+                'cross-sells' => [
+                    1003
+                ]
+            ],
+            [
+                'productLinks' => $links,
+                'cartProducts' => [
+                    1002,
+                    1003,
+                ],
+                'lastAddedProduct' => null,
+                'cross-sells' => [
+                ]
+            ]
+        ];
+    }
+
+    /**
+     * @param array $data
+     * @return MockObject
+     */
+    private function getProduct(array $data): MockObject
+    {
+        $product = $this->createPartialMock(Product::class, []);
+        $product->setData($data);
+        return $product;
+    }
+
+    /**
+     * @return MockObject
+     */
+    private function createLinkCollection(): MockObject
+    {
+        $returnSelfMethods = [
+            'setStoreId',
+            'setPageSize',
+            'setGroupBy',
+            'setVisibility',
+            'addMinimalPrice',
+            'addFinalPrice',
+            'addTaxPercents',
+            'addAttributeToSelect',
+            'addStoreFilter',
+            'setPositionOrder',
+            'addUrlRewrite',
+            'load',
+        ];
+        $linkCollection = $this->createPartialMock(
+            Collection::class,
+            array_merge(
+                $returnSelfMethods,
+                [
+                    'addProductFilter',
+                    'addExcludeProductFilter',
+                    'getSelect',
+                    'getIterator',
+                ]
+            )
+        );
+        foreach ($returnSelfMethods as $method) {
+            $linkCollection->method($method)
+                ->willReturnSelf();
+        }
+        $linkCollection->method('addProductFilter')
+            ->willReturnCallback(
+                function ($products) use ($linkCollection) {
+                    if (!is_array($products)) {
+                        $products = [$products];
+                    }
+                    $linkCollection->setFlag('test_product_ids', $products);
+                    return $linkCollection;
+                }
+            );
+        $linkCollection->method('addExcludeProductFilter')
+            ->willReturnCallback(
+                function ($products) use ($linkCollection) {
+                    if (!is_array($products)) {
+                        $products = [$products];
+                    }
+                    $linkCollection->setFlag('test_exclude_product_ids', $products);
+                    return $linkCollection;
+                }
+            );
+        $linkCollection->method('getSelect')->willReturn(
+            $this->createMock(Select::class)
+        );
+        $linkCollection->method('getIterator')
+            ->willReturnCallback(
+                function () use ($linkCollection) {
+                    $productIds = $linkCollection->getFlag('test_product_ids') ?? [];
+                    $excludeProductIds = $linkCollection->getFlag('test_exclude_product_ids') ?? [];
+                    $links = [];
+                    foreach ($productIds as $id) {
+                        if (isset($this->productLinks[$id])) {
+                            array_push($links, ...$this->productLinks[$id]);
+                        }
+                    }
+                    $links = array_values(array_unique(array_diff($links, $excludeProductIds)));
+                    $links = array_combine($links, $links);
+                    $products = array_map(
+                        function ($id) {
+                            return $this->getProduct(['entity_id' => $id]);
+                        },
+                        $links
+                    );
+                    return new \ArrayIterator($products);
+                }
+            );
+        return $linkCollection;
+    }
+
+    /**
+     * @return MockObject
+     */
+    private function createProductCollection(): MockObject
+    {
+        $productCollection = $this->createMock(\Magento\Catalog\Model\ResourceModel\Product\Collection::class);
+        $entityMetadataInterface =$this->createMock(EntityMetadataInterface::class);
+        $entityMetadataInterface->method('getLinkField')
+            ->willReturn('entity_id');
+        $productCollection->method('getProductEntityMetadata')
+            ->willReturn($entityMetadataInterface);
+        return $productCollection;
+    }
+}

From d5c86eb754eb1f9d4849b5d2f7dd8f270d436b1a Mon Sep 17 00:00:00 2001
From: Dmytro Horytskyi <dhorytskyi@magento.com>
Date: Thu, 30 Apr 2020 13:07:10 -0500
Subject: [PATCH 058/120] MC-33794: Shared file-system issue

---
 .../Magento/Framework/File/Uploader.php       | 67 +++++++++++++------
 1 file changed, 48 insertions(+), 19 deletions(-)

diff --git a/lib/internal/Magento/Framework/File/Uploader.php b/lib/internal/Magento/Framework/File/Uploader.php
index f9b41709ec7c8..dde98bd7d41b0 100644
--- a/lib/internal/Magento/Framework/File/Uploader.php
+++ b/lib/internal/Magento/Framework/File/Uploader.php
@@ -6,7 +6,10 @@
 namespace Magento\Framework\File;
 
 use Magento\Framework\App\Filesystem\DirectoryList;
+use Magento\Framework\App\ObjectManager;
 use Magento\Framework\Exception\FileSystemException;
+use Magento\Framework\Filesystem\DriverInterface;
+use Magento\Framework\Filesystem\DriverPool;
 use Magento\Framework\Validation\ValidationException;
 
 /**
@@ -143,15 +146,13 @@ class Uploader
 
     /**
      * Maximum Image Width resolution in pixels. For image resizing on client side
-     * @deprecated
-     * @see \Magento\Framework\Image\Adapter\UploadConfigInterface::getMaxWidth()
+     * @deprecated @see \Magento\Framework\Image\Adapter\UploadConfigInterface::getMaxWidth()
      */
     const MAX_IMAGE_WIDTH = 1920;
 
     /**
      * Maximum Image Height resolution in pixels. For image resizing on client side
-     * @deprecated
-     * @see \Magento\Framework\Image\Adapter\UploadConfigInterface::getMaxHeight()
+     * @deprecated @see \Magento\Framework\Image\Adapter\UploadConfigInterface::getMaxHeight()
      */
     const MAX_IMAGE_HEIGHT = 1200;
 
@@ -168,21 +169,32 @@ class Uploader
      */
     private $directoryList;
 
+    /**
+     * @var DriverPool|null
+     */
+    private $driverPool;
+
+    /**
+     * @var DriverInterface|null
+     */
+    private $fileDriver;
+
     /**
      * Init upload
      *
      * @param string|array $fileId
      * @param \Magento\Framework\File\Mime|null $fileMime
      * @param DirectoryList|null $directoryList
+     * @param DriverPool|null $driverPool
      * @throws \DomainException
      */
     public function __construct(
         $fileId,
         Mime $fileMime = null,
-        DirectoryList $directoryList = null
+        DirectoryList $directoryList = null,
+        DriverPool $driverPool = null
     ) {
-        $this->directoryList= $directoryList ?: \Magento\Framework\App\ObjectManager::getInstance()
-            ->get(DirectoryList::class);
+        $this->directoryList= $directoryList ?: ObjectManager::getInstance()->get(DirectoryList::class);
 
         $this->_setUploadFileId($fileId);
         if (!file_exists($this->_file['tmp_name'])) {
@@ -191,7 +203,8 @@ public function __construct(
         } else {
             $this->_fileExists = true;
         }
-        $this->fileMime = $fileMime ?: \Magento\Framework\App\ObjectManager::getInstance()->get(Mime::class);
+        $this->fileMime = $fileMime ?: ObjectManager::getInstance()->get(Mime::class);
+        $this->driverPool = $driverPool;
     }
 
     /**
@@ -229,7 +242,7 @@ public function save($destinationFolder, $newFileName = null)
             $this->setAllowCreateFolders(true);
             $this->_dispretionPath = static::getDispersionPath($fileName);
             $destinationFile .= $this->_dispretionPath;
-            $this->_createDestinationFolder($destinationFile);
+            $this->createDestinationFolder($destinationFile);
         }
 
         if ($this->_allowRenameFiles) {
@@ -274,13 +287,11 @@ public function save($destinationFolder, $newFileName = null)
      * @return void
      * @throws FileSystemException
      */
-    private function validateDestination($destinationFolder)
+    private function validateDestination(string $destinationFolder): void
     {
         if ($this->_allowCreateFolders) {
-            $this->_createDestinationFolder($destinationFolder);
-        }
-
-        if (!is_writable($destinationFolder)) {
+            $this->createDestinationFolder($destinationFolder);
+        } elseif (!$this->getFileDriver()->isWritable($destinationFolder)) {
             throw new FileSystemException(__('Destination folder is not writable or does not exists.'));
         }
     }
@@ -654,7 +665,7 @@ private function validateFileId(array $fileId): void
      * @return \Magento\Framework\File\Uploader
      * @throws FileSystemException
      */
-    private function _createDestinationFolder($destinationFolder)
+    private function createDestinationFolder(string $destinationFolder)
     {
         if (!$destinationFolder) {
             return $this;
@@ -664,11 +675,13 @@ private function _createDestinationFolder($destinationFolder)
             $destinationFolder = substr($destinationFolder, 0, -1);
         }
 
-        if (!(@is_dir($destinationFolder)
-            || @mkdir($destinationFolder, 0777, true)
-        )) {
-            throw new FileSystemException(__('Unable to create directory %1.', $destinationFolder));
+        if (!$this->getFileDriver()->isDirectory($destinationFolder)) {
+            $result = $this->getFileDriver()->createDirectory($destinationFolder);
+            if (!$result) {
+                throw new FileSystemException(__('Unable to create directory %1.', $destinationFolder));
+            }
         }
+
         return $this;
     }
 
@@ -730,4 +743,20 @@ public static function getDispersionPath($fileName)
         }
         return $dispersionPath;
     }
+
+    /**
+     * Get driver for file
+     *
+     * @deprecated
+     * @return DriverInterface
+     */
+    private function getFileDriver(): DriverInterface
+    {
+        if (!$this->fileDriver) {
+            $this->driverPool = $this->driverPool ?: ObjectManager::getInstance()->get(DriverPool::class);
+            $this->fileDriver = $this->driverPool->getDriver(DriverPool::FILE);
+        }
+
+        return $this->fileDriver;
+    }
 }

From f146128ecf2c765bd766ff0a256f444350a0c6c7 Mon Sep 17 00:00:00 2001
From: Dmytro Horytskyi <dhorytskyi@magento.com>
Date: Thu, 30 Apr 2020 16:50:58 -0500
Subject: [PATCH 059/120] MC-33898: Uninformative exception message when di
 compile fails due to not existed dependency

---
 .../Magento/Framework/Code/Reader/ClassReader.php         | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/lib/internal/Magento/Framework/Code/Reader/ClassReader.php b/lib/internal/Magento/Framework/Code/Reader/ClassReader.php
index 1f14d5e2db8dc..2aad3b83390bf 100644
--- a/lib/internal/Magento/Framework/Code/Reader/ClassReader.php
+++ b/lib/internal/Magento/Framework/Code/Reader/ClassReader.php
@@ -7,8 +7,6 @@
 
 /**
  * Class ClassReader
- *
- * @package Magento\Framework\Code\Reader
  */
 class ClassReader implements ClassReaderInterface
 {
@@ -39,7 +37,11 @@ public function getConstructor($className)
                         $parameter->isVariadic(),
                     ];
                 } catch (\ReflectionException $e) {
-                    $message = $e->getMessage();
+                    $message = sprintf(
+                        'Impossible to process constructor argument %s of %s class',
+                        $parameter->__toString(),
+                        $className
+                    );
                     throw new \ReflectionException($message, 0, $e);
                 }
             }

From 589497d8b35eaba78b8c06fe75ebfa1b2429b598 Mon Sep 17 00:00:00 2001
From: Dmytro Horytskyi <dhorytskyi@magento.com>
Date: Thu, 30 Apr 2020 17:26:48 -0500
Subject: [PATCH 060/120] MC-33898: Uninformative exception message when di
 compile fails due to not existed dependency

---
 .../Code/Test/Unit/Reader/ClassReaderTest.php | 21 +++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/lib/internal/Magento/Framework/Code/Test/Unit/Reader/ClassReaderTest.php b/lib/internal/Magento/Framework/Code/Test/Unit/Reader/ClassReaderTest.php
index e2786bffc10fe..6829ef780e648 100644
--- a/lib/internal/Magento/Framework/Code/Test/Unit/Reader/ClassReaderTest.php
+++ b/lib/internal/Magento/Framework/Code/Test/Unit/Reader/ClassReaderTest.php
@@ -60,6 +60,27 @@ public function testGetParents()
         );
     }
 
+    /**
+     * Check that while processing nonexistent argument of constructor exception message contains original class name
+     */
+    public function testGetConstructorWithNonexistentDependency()
+    {
+        $testClass = new class {
+            private $arg;
+
+            // phpstan:ignore
+            public function __construct(?\NonexistentDependency $arg = null)
+            {
+                $this->arg = $arg;
+            }
+        };
+
+        $className = get_class($testClass);
+        $this->expectException(\ReflectionException::class);
+        $this->expectExceptionMessage($className);
+        $this->model->getConstructor($className);
+    }
+
     /**
      * Data provider
      *

From 2c8839699612fa67db10ba795f5357dbc42756f5 Mon Sep 17 00:00:00 2001
From: Tu Nguyen <ladiesman9x@gmail.com>
Date: Fri, 1 May 2020 21:07:32 +0700
Subject: [PATCH 061/120] Remove unnecessary active class style

Change after review
---
 .../web/css/source/module/main/_collapsible-blocks.less     | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/main/_collapsible-blocks.less b/app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/main/_collapsible-blocks.less
index c731b9268260b..bdc986e918c2c 100644
--- a/app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/main/_collapsible-blocks.less
+++ b/app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/main/_collapsible-blocks.less
@@ -122,12 +122,6 @@
                 &:before {
                     content: @icon-expand-close__content;
                 }
-
-                &.active {
-                    &:before {
-                        content: @icon-expand-close__content;
-                    }
-                }
             }
         }
 

From b285342bbf4a0a23f962edc84db825a815fc55ff Mon Sep 17 00:00:00 2001
From: Tu Nguyen <ladiesman9x@gmail.com>
Date: Sun, 3 May 2020 04:48:09 +0700
Subject: [PATCH 062/120] Fix problem button used class action-primary changed
 color

---
 app/design/frontend/Magento/blank/web/css/source/_buttons.less | 3 ++-
 app/design/frontend/Magento/luma/web/css/source/_buttons.less  | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/app/design/frontend/Magento/blank/web/css/source/_buttons.less b/app/design/frontend/Magento/blank/web/css/source/_buttons.less
index 93f99e9d4d594..dfc0aa0319d4f 100644
--- a/app/design/frontend/Magento/blank/web/css/source/_buttons.less
+++ b/app/design/frontend/Magento/blank/web/css/source/_buttons.less
@@ -25,7 +25,8 @@
         .lib-link-as-button();
     }
 
-    .action.primary {
+    .action.primary,
+    .action-primary {
         .lib-button-primary();
     }
 }
diff --git a/app/design/frontend/Magento/luma/web/css/source/_buttons.less b/app/design/frontend/Magento/luma/web/css/source/_buttons.less
index 678b7e3401a86..1587b0a26c309 100644
--- a/app/design/frontend/Magento/luma/web/css/source/_buttons.less
+++ b/app/design/frontend/Magento/luma/web/css/source/_buttons.less
@@ -39,7 +39,8 @@
         .lib-link-as-button();
     }
 
-    .action.primary {
+    .action.primary,
+    .action-primary {
         .lib-button-primary();
     }
 }

From d68fa5d45b66754801e65b440d1338463396ad9f Mon Sep 17 00:00:00 2001
From: Tu Nguyen <ladiesman9x@gmail.com>
Date: Sun, 3 May 2020 06:15:17 +0700
Subject: [PATCH 063/120] Fix incorrect inline labels in login form

---
 .../Magento_Customer/web/css/source/_module.less    | 13 -------------
 1 file changed, 13 deletions(-)

diff --git a/app/design/frontend/Magento/blank/Magento_Customer/web/css/source/_module.less b/app/design/frontend/Magento/blank/Magento_Customer/web/css/source/_module.less
index adfcb117cc9d0..c3634239056db 100644
--- a/app/design/frontend/Magento/blank/Magento_Customer/web/css/source/_module.less
+++ b/app/design/frontend/Magento/blank/Magento_Customer/web/css/source/_module.less
@@ -414,8 +414,6 @@
             &:extend(.abs-blocks-2columns all);
             .login {
                 .actions-toolbar {
-                    margin-left: 0;
-
                     > .primary {
                         margin-bottom: 0;
                         margin-right: @indent__l;
@@ -430,19 +428,8 @@
 
         .fieldset {
             &:after {
-                margin-left: 0;
                 &:extend(.abs-margin-for-forms-desktop all);
             }
-
-            > .field {
-                > .control {
-                    width: 80%;
-                }
-
-                .label {
-                    text-align: left;
-                }
-            }
         }
     }
 

From 298d306af69ce11cbf46f6bfbcd0410e04f54655 Mon Sep 17 00:00:00 2001
From: "rostyslav.hymon" <rostyslav.hymon@transoftgroup.com>
Date: Mon, 4 May 2020 09:19:01 +0300
Subject: [PATCH 064/120] MC-33745: Magento Order Summary Shows Incorrect
 Discount Amount

---
 app/code/Magento/SalesRule/Model/Validator.php            | 4 ++--
 .../Magento/SalesRule/Test/Unit/Model/ValidatorTest.php   | 6 +++++-
 .../scenarios/including_tax_apply_tax_after_discount.php  | 8 ++++----
 3 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/app/code/Magento/SalesRule/Model/Validator.php b/app/code/Magento/SalesRule/Model/Validator.php
index cdaac97fe6fb5..06bc7e12fb973 100644
--- a/app/code/Magento/SalesRule/Model/Validator.php
+++ b/app/code/Magento/SalesRule/Model/Validator.php
@@ -340,8 +340,8 @@ public function processShippingAmount(Address $address)
                 $address->getBaseShippingDiscountAmount() + $baseDiscountAmount,
                 $baseShippingAmount
             );
-            $address->setShippingDiscountAmount($discountAmount);
-            $address->setBaseShippingDiscountAmount($baseDiscountAmount);
+            $address->setShippingDiscountAmount($this->priceCurrency->roundPrice($discountAmount));
+            $address->setBaseShippingDiscountAmount($this->priceCurrency->roundPrice($baseDiscountAmount));
             $appliedRuleIds[$rule->getRuleId()] = $rule->getRuleId();
 
             $this->rulesApplier->maintainAddressCouponCode($address, $rule, $this->getCouponCode());
diff --git a/app/code/Magento/SalesRule/Test/Unit/Model/ValidatorTest.php b/app/code/Magento/SalesRule/Test/Unit/Model/ValidatorTest.php
index 946963dd8d234..9a62713a58950 100644
--- a/app/code/Magento/SalesRule/Test/Unit/Model/ValidatorTest.php
+++ b/app/code/Magento/SalesRule/Test/Unit/Model/ValidatorTest.php
@@ -115,7 +115,8 @@ protected function setUp()
         $ruleCollectionFactoryMock = $this->prepareRuleCollectionMock($this->ruleCollection);
         $this->priceCurrency = $this->getMockBuilder(PriceCurrencyInterface::class)
             ->disableOriginalConstructor()
-            ->getMock();
+            ->setMethods(['roundPrice'])
+            ->getMockForAbstractClass();
 
         /** @var Validator|MockObject $validator */
         $this->model = $this->helper->getObject(
@@ -516,6 +517,9 @@ public function testProcessShippingAmountActions($action, $ruleDiscount, $shippi
         $this->priceCurrency->method('convert')
             ->willReturn($ruleDiscount);
 
+        $this->priceCurrency->method('roundPrice')
+            ->willReturn(round($shippingDiscount, 2));
+
         $this->model->init(
             $this->model->getWebsiteId(),
             $this->model->getCustomerGroupId(),
diff --git a/dev/tests/integration/testsuite/Magento/Tax/_files/scenarios/including_tax_apply_tax_after_discount.php b/dev/tests/integration/testsuite/Magento/Tax/_files/scenarios/including_tax_apply_tax_after_discount.php
index e0cb82e50cbd4..028512a9eb142 100644
--- a/dev/tests/integration/testsuite/Magento/Tax/_files/scenarios/including_tax_apply_tax_after_discount.php
+++ b/dev/tests/integration/testsuite/Magento/Tax/_files/scenarios/including_tax_apply_tax_after_discount.php
@@ -73,14 +73,14 @@
             'base_shipping_incl_tax' => 5,
             'shipping_tax_amount' => 0.25,
             'base_shipping_tax_amount' => 0.25,
-            'discount_amount' => -15.455,
-            'base_discount_amount' => -15.455,
+            'discount_amount' => -15.46,
+            'base_discount_amount' => -15.46,
             'discount_tax_compensation_amount' => 1.2,
             'base_discount_tax_compensation_amount' => 1.2,
             'shipping_discount_tax_compensation_amount' => 0.2,
             'base_shipping_discount_tax_compensation_amount' => 0.2,
-            'grand_total' => 18.545,
-            'base_grand_total' => 18.545,
+            'grand_total' => 18.54,
+            'base_grand_total' => 18.54,
             'applied_taxes' => [
                 SetupUtil::TAX_RATE_TX => [
                     'percent' => 10,

From 1b8199afd1ec5efe782b06e29f9b3216e4589b7d Mon Sep 17 00:00:00 2001
From: Tu Nguyen <ladiesman9x@gmail.com>
Date: Mon, 4 May 2020 13:58:34 +0700
Subject: [PATCH 065/120] Remove unneccessary white shadow apply to button

---
 app/design/frontend/Magento/luma/web/css/source/_buttons.less | 2 --
 1 file changed, 2 deletions(-)

diff --git a/app/design/frontend/Magento/luma/web/css/source/_buttons.less b/app/design/frontend/Magento/luma/web/css/source/_buttons.less
index 1587b0a26c309..3ca4e8acf185e 100644
--- a/app/design/frontend/Magento/luma/web/css/source/_buttons.less
+++ b/app/design/frontend/Magento/luma/web/css/source/_buttons.less
@@ -17,8 +17,6 @@
 
     button {
         &:not(.primary) {
-            .lib-css(box-shadow, @button__shadow);
-
             &:active {
                 .lib-css(box-shadow, @button__shadow-active);
             }

From b8e26ce83d737387a40715297e7ade605458266c Mon Sep 17 00:00:00 2001
From: Tu Nguyen <ladiesman9x@gmail.com>
Date: Mon, 4 May 2020 14:38:02 +0700
Subject: [PATCH 066/120] update code for maintain backward compatible

---
 app/design/frontend/Magento/luma/web/css/source/_buttons.less | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/design/frontend/Magento/luma/web/css/source/_buttons.less b/app/design/frontend/Magento/luma/web/css/source/_buttons.less
index 3ca4e8acf185e..c546190d7a30c 100644
--- a/app/design/frontend/Magento/luma/web/css/source/_buttons.less
+++ b/app/design/frontend/Magento/luma/web/css/source/_buttons.less
@@ -17,6 +17,8 @@
 
     button {
         &:not(.primary) {
+            .lib-css(box-shadow, none);
+            
             &:active {
                 .lib-css(box-shadow, @button__shadow-active);
             }

From cc3f6a08396a6ea56de5d0e46932d20f730ea69e Mon Sep 17 00:00:00 2001
From: Tu Nguyen <ladiesman9x@gmail.com>
Date: Mon, 4 May 2020 14:42:02 +0700
Subject: [PATCH 067/120] remove whitespace

---
 app/design/frontend/Magento/luma/web/css/source/_buttons.less | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/design/frontend/Magento/luma/web/css/source/_buttons.less b/app/design/frontend/Magento/luma/web/css/source/_buttons.less
index c546190d7a30c..5296bcc070fb4 100644
--- a/app/design/frontend/Magento/luma/web/css/source/_buttons.less
+++ b/app/design/frontend/Magento/luma/web/css/source/_buttons.less
@@ -18,7 +18,7 @@
     button {
         &:not(.primary) {
             .lib-css(box-shadow, none);
-            
+
             &:active {
                 .lib-css(box-shadow, @button__shadow-active);
             }

From d4edaddd2d895bd6f2c62ae1b02d447b7667e40b Mon Sep 17 00:00:00 2001
From: Buba Suma <soumah@adobe.com>
Date: Mon, 4 May 2020 13:59:30 +0300
Subject: [PATCH 068/120] MC-33313: [Magento Cloud] - Error when assign
 customer to a group

---
 .../Model/Quote/Address/Total/Subtotal.php    |  64 ++++----
 .../Quote/Address/Total/SubtotalTest.php      | 142 ++++++++++++++----
 2 files changed, 143 insertions(+), 63 deletions(-)

diff --git a/app/code/Magento/Quote/Model/Quote/Address/Total/Subtotal.php b/app/code/Magento/Quote/Model/Quote/Address/Total/Subtotal.php
index a22a9865db186..22876664fe53c 100644
--- a/app/code/Magento/Quote/Model/Quote/Address/Total/Subtotal.php
+++ b/app/code/Magento/Quote/Model/Quote/Address/Total/Subtotal.php
@@ -9,6 +9,9 @@
 use Magento\Quote\Model\Quote\Address\Item as AddressItem;
 use Magento\Quote\Model\Quote\Item;
 
+/**
+ * Address total collector model
+ */
 class Subtotal extends \Magento\Quote\Model\Quote\Address\Total\AbstractTotal
 {
     /**
@@ -89,40 +92,35 @@ protected function _initItem($address, $item)
         } else {
             $quoteItem = $item;
         }
-        $product = $quoteItem->getProduct();
-        $product->setCustomerGroupId($quoteItem->getQuote()->getCustomerGroupId());
-
-        /**
-         * Quote super mode flag mean what we work with quote without restriction
-         */
-        if ($item->getQuote()->getIsSuperMode()) {
-            if (!$product) {
-                return false;
-            }
-        } else {
-            if (!$product || !$product->isVisibleInCatalog()) {
-                return false;
+        $valid = false;
+        if ($quoteItem) {
+            $product = $quoteItem->getProduct();
+            /**
+             * Quote super mode flag mean what we work with quote without restriction
+             */
+            if ($product && ($item->getQuote()->getIsSuperMode() || $product->isVisibleInCatalog())) {
+                $product->setCustomerGroupId($quoteItem->getQuote()->getCustomerGroupId());
+                $quoteItem->setConvertedPrice(null);
+                $originalPrice = $product->getPrice();
+                if ($quoteItem->getParentItem() && $quoteItem->isChildrenCalculated()) {
+                    $finalPrice = $quoteItem->getParentItem()->getProduct()->getPriceModel()->getChildFinalPrice(
+                        $quoteItem->getParentItem()->getProduct(),
+                        $quoteItem->getParentItem()->getQty(),
+                        $product,
+                        $quoteItem->getQty()
+                    );
+                    $this->_calculateRowTotal($item, $finalPrice, $originalPrice);
+                } elseif (!$quoteItem->getParentItem()) {
+                    $finalPrice = $product->getFinalPrice($quoteItem->getQty());
+                    $this->_calculateRowTotal($item, $finalPrice, $originalPrice);
+                    $this->_addAmount($item->getRowTotal());
+                    $this->_addBaseAmount($item->getBaseRowTotal());
+                    $address->setTotalQty($address->getTotalQty() + $item->getQty());
+                }
+                $valid = true;
             }
         }
-
-        $quoteItem->setConvertedPrice(null);
-        $originalPrice = $product->getPrice();
-        if ($quoteItem->getParentItem() && $quoteItem->isChildrenCalculated()) {
-            $finalPrice = $quoteItem->getParentItem()->getProduct()->getPriceModel()->getChildFinalPrice(
-                $quoteItem->getParentItem()->getProduct(),
-                $quoteItem->getParentItem()->getQty(),
-                $product,
-                $quoteItem->getQty()
-            );
-            $this->_calculateRowTotal($item, $finalPrice, $originalPrice);
-        } elseif (!$quoteItem->getParentItem()) {
-            $finalPrice = $product->getFinalPrice($quoteItem->getQty());
-            $this->_calculateRowTotal($item, $finalPrice, $originalPrice);
-            $this->_addAmount($item->getRowTotal());
-            $this->_addBaseAmount($item->getBaseRowTotal());
-            $address->setTotalQty($address->getTotalQty() + $item->getQty());
-        }
-        return true;
+        return $valid;
     }
 
     /**
@@ -147,7 +145,7 @@ protected function _calculateRowTotal($item, $finalPrice, $originalPrice)
      * Remove item
      *
      * @param Address $address
-     * @param  AddressItem|Item $item
+     * @param AddressItem|Item $item
      * @return $this
      */
     protected function _removeItem($address, $item)
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 c4a8081fbb8fa..e8293f431a4f9 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
@@ -5,42 +5,59 @@
  */
 namespace Magento\Quote\Test\Unit\Model\Quote\Address\Total;
 
+use Magento\Catalog\Api\Data\ProductExtensionInterface;
+use Magento\Catalog\Model\Product;
+use Magento\Catalog\Model\Product\Type\Price;
+use Magento\CatalogInventory\Model\StockRegistry;
+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\Item as AddressItem;
+use Magento\Quote\Model\Quote\Address\Total;
+use Magento\Quote\Model\Quote\Address\Total\Subtotal;
+use Magento\Quote\Model\Quote\Item;
+use Magento\Store\Model\Store;
+use PHPUnit\Framework\MockObject\MockObject;
+use PHPUnit\Framework\TestCase;
+use PHPUnit_Framework_MockObject_MockObject;
+
 /**
- * Class SubtotalTest
- * @package Magento\Quote\Model\Quote\Address\Total
- * TODO refactor me
+ * Test address total collector model.
  *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
-class SubtotalTest extends \PHPUnit\Framework\TestCase
+class SubtotalTest extends TestCase
 {
     /**
-     * @var \Magento\Framework\TestFramework\Unit\Helper\ObjectManager
+     * @var ObjectManager
      */
     protected $objectManager;
 
     /**
-     * @var \Magento\Quote\Model\Quote\Address\Total\Subtotal
+     * @var Subtotal
      */
     protected $subtotalModel;
 
-    /** @var \PHPUnit_Framework_MockObject_MockObject */
+    /** @var MockObject */
     protected $stockItemMock;
 
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject
+     * @var MockObject
      */
     protected $stockRegistry;
 
     protected function setUp()
     {
-        $this->objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
+        $this->objectManager = new ObjectManager($this);
         $this->subtotalModel = $this->objectManager->getObject(
-            \Magento\Quote\Model\Quote\Address\Total\Subtotal::class
+            Subtotal::class
         );
 
         $this->stockRegistry = $this->createPartialMock(
-            \Magento\CatalogInventory\Model\StockRegistry::class,
+            StockRegistry::class,
             ['getStockItem', '__wakeup']
         );
         $this->stockItemMock = $this->createPartialMock(
@@ -78,39 +95,39 @@ public function testCollect($price, $originalPrice, $itemHasParent, $expectedPri
     {
         $this->stockRegistry->expects($this->any())->method('getStockItem')->willReturn($this->stockItemMock);
 
-        $priceCurrency = $this->getMockBuilder(\Magento\Framework\Pricing\PriceCurrencyInterface::class)->getMock();
+        $priceCurrency = $this->getMockBuilder(PriceCurrencyInterface::class)->getMock();
         $convertedPrice = 1231313;
         // @TODO this is a wrong test and it does not check methods. Any digital value will be correct
         $priceCurrency->expects($this->any())->method('convert')->willReturn(1231313);
 
-        /** @var \Magento\Quote\Model\Quote\Item|\PHPUnit_Framework_MockObject_MockObject $quoteItem */
+        /** @var Item|PHPUnit_Framework_MockObject_MockObject $quoteItem */
         $quoteItem = $this->objectManager->getObject(
-            \Magento\Quote\Model\Quote\Item::class,
+            Item::class,
             [
                 'stockRegistry' => $this->stockRegistry,
                 'priceCurrency' => $priceCurrency,
             ]
         );
-        /** @var \Magento\Quote\Model\Quote\Address|\PHPUnit_Framework_MockObject_MockObject $address */
+        /** @var Address|MockObject $address */
         $address = $this->createPartialMock(
-            \Magento\Quote\Model\Quote\Address::class,
+            Address::class,
             ['setTotalQty', 'getTotalQty', 'removeItem', 'getQuote']
         );
 
-        /** @var \Magento\Catalog\Model\Product|\PHPUnit_Framework_MockObject_MockObject $product */
-        $product = $this->createMock(\Magento\Catalog\Model\Product::class);
+        /** @var Product|MockObject $product */
+        $product = $this->createMock(Product::class);
         $product->expects($this->any())->method('getPrice')->will($this->returnValue($originalPrice));
 
-        /** @var \Magento\Quote\Model\Quote|\PHPUnit_Framework_MockObject_MockObject $quote */
-        $quote = $this->createMock(\Magento\Quote\Model\Quote::class);
-        $store = $this->objectManager->getObject(\Magento\Store\Model\Store::class);
+        /** @var Quote|MockObject $quote */
+        $quote = $this->createMock(Quote::class);
+        $store = $this->objectManager->getObject(Store::class);
         $store->setCurrentCurrency('');
 
-        $store = $this->createPartialMock(\Magento\Store\Model\Store::class, ['getWebsiteId']);
+        $store = $this->createPartialMock(Store::class, ['getWebsiteId']);
         $store->expects($this->any())->method('getWebsiteId')->willReturn(10);
         $product->expects($this->any())->method('getStore')->willReturn($store);
         $product->expects($this->any())->method('isVisibleInCatalog')->will($this->returnValue(true));
-        $extensionAttribute = $this->getMockBuilder(\Magento\Catalog\Api\Data\ProductExtensionInterface::class)
+        $extensionAttribute = $this->getMockBuilder(ProductExtensionInterface::class)
             ->setMethods(['getStockItem'])
             ->disableOriginalConstructor()
             ->getMockForAbstractClass();
@@ -123,28 +140,28 @@ public function testCollect($price, $originalPrice, $itemHasParent, $expectedPri
 
         $parentQuoteItem = false;
         if ($itemHasParent) {
-            $parentQuoteItem = $this->createMock(\Magento\Quote\Model\Quote\Item::class);
+            $parentQuoteItem = $this->createMock(Item::class);
             $parentQuoteItem->expects($this->any())->method('getProduct')->will($this->returnValue($product));
         }
         $quoteItem->setParentItem($parentQuoteItem);
         //This value will be overwritten
         $quoteItem->setConvertedPrice(10);
 
-        $priceModel = $this->createMock(\Magento\Catalog\Model\Product\Type\Price::class);
+        $priceModel = $this->createMock(Price::class);
         $priceModel->expects($this->any())->method('getChildFinalPrice')->willReturn($price);
         $product->expects($this->any())->method('getPriceModel')->willReturn($priceModel);
         $product->expects($this->any())->method('getFinalPrice')->willReturn($price);
 
-        $shipping = $this->createMock(\Magento\Quote\Api\Data\ShippingInterface::class);
+        $shipping = $this->createMock(ShippingInterface::class);
         $shipping->expects($this->exactly(2))->method('getAddress')->willReturn($address);
         $address->expects($this->at(0))->method('setTotalQty')->with(0);
         $address->expects($this->any())->method('getTotalQty')->willReturn(0);
-        $shippingAssignmentMock = $this->createMock(\Magento\Quote\Api\Data\ShippingAssignmentInterface::class);
+        $shippingAssignmentMock = $this->createMock(ShippingAssignmentInterface::class);
         $shippingAssignmentMock->expects($this->exactly(2))->method('getShipping')->willReturn($shipping);
         $shippingAssignmentMock->expects($this->once())->method('getItems')->willReturn([$quoteItem]);
 
         $total = $this->createPartialMock(
-            \Magento\Quote\Model\Quote\Address\Total::class,
+            Total::class,
             ['setBaseVirtualAmount', 'setVirtualAmount']
         );
         $total->expects($this->once())->method('setBaseVirtualAmount')->willReturnSelf();
@@ -166,10 +183,75 @@ public function testFetch()
             'value' => 100
         ];
 
-        $quoteMock = $this->createMock(\Magento\Quote\Model\Quote::class);
-        $totalMock = $this->createPartialMock(\Magento\Quote\Model\Quote\Address\Total::class, ['getSubtotal']);
+        $quoteMock = $this->createMock(Quote::class);
+        $totalMock = $this->createPartialMock(Total::class, ['getSubtotal']);
         $totalMock->expects($this->once())->method('getSubtotal')->willReturn(100);
 
         $this->assertEquals($expectedResult, $this->subtotalModel->fetch($quoteMock, $totalMock));
     }
+
+    /**
+     * Test that invalid items are not collected
+     */
+    public function testCollectWithInvalidItems()
+    {
+        $addressItemId = 38203;
+        $addressQuoteItemId = 7643;
+        $storeId = 1;
+        $quote = $this->createPartialMock(
+            Quote::class,
+            [
+                'getItemsCollection',
+            ]
+        );
+        $quote->setData(
+            [
+                'store_id' => $storeId
+            ]
+        );
+        $quoteItem = $this->createPartialMock(
+            Item::class,
+            []
+        );
+        $quoteItem->setQuote($quote);
+        $quote->method('getItemsCollection')
+            ->willReturn([$quoteItem]);
+        $address = $this->createPartialMock(
+            Address::class,
+            [
+                'removeItem',
+                'getQuote'
+            ]
+        );
+        $address->method('getQuote')
+            ->willReturn($quote);
+        $address->expects($this->once())
+            ->method('removeItem')
+            ->with($addressItemId);
+        $addressItem = $this->createPartialMock(
+            AddressItem::class,
+            [
+                'getId',
+                'getQuoteItemId'
+            ]
+        );
+        $addressItem->setAddress($address);
+        $addressItem->method('getId')
+            ->willReturn($addressItemId);
+        $addressItem->method('getQuoteItemId')
+            ->willReturn($addressQuoteItemId);
+        $shipping = $this->createMock(ShippingInterface::class);
+        $shipping->method('getAddress')
+            ->willReturn($address);
+        $shippingAssignmentMock = $this->createMock(ShippingAssignmentInterface::class);
+        $shippingAssignmentMock->method('getShipping')
+            ->willReturn($shipping);
+        $shippingAssignmentMock->method('getItems')
+            ->willReturn([$addressItem]);
+        $total = $this->createPartialMock(
+            Total::class,
+            []
+        );
+        $this->subtotalModel->collect($quote, $shippingAssignmentMock, $total);
+    }
 }

From a9d7fcd400923e9b772efd43aa8fee4fc36606bd Mon Sep 17 00:00:00 2001
From: "rostyslav.hymon" <rostyslav.hymon@transoftgroup.com>
Date: Mon, 4 May 2020 15:58:18 +0300
Subject: [PATCH 069/120] MC-33313: [Magento Cloud] - Error when assign
 customer to a group

---
 .../Quote/Test/Unit/Model/Quote/Address/Total/SubtotalTest.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

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 e8293f431a4f9..a06bc211d0d57 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
@@ -22,7 +22,6 @@
 use Magento\Store\Model\Store;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
-use PHPUnit_Framework_MockObject_MockObject;
 
 /**
  * Test address total collector model.
@@ -100,7 +99,7 @@ public function testCollect($price, $originalPrice, $itemHasParent, $expectedPri
         // @TODO this is a wrong test and it does not check methods. Any digital value will be correct
         $priceCurrency->expects($this->any())->method('convert')->willReturn(1231313);
 
-        /** @var Item|PHPUnit_Framework_MockObject_MockObject $quoteItem */
+        /** @var Item|MockObject $quoteItem */
         $quoteItem = $this->objectManager->getObject(
             Item::class,
             [

From 46a696120736897a7e07c487f186938d1ed4107a Mon Sep 17 00:00:00 2001
From: Serhiy Yelahin <serhiy.yelahin@transoftgroup.com>
Date: Tue, 5 May 2020 10:55:57 +0300
Subject: [PATCH 070/120] MC-33267: UPS Shipping label generation issue

---
 app/code/Magento/Ups/Model/Carrier.php        | 234 ++++++++++--------
 .../HTTP/AsyncClientInterfaceMock.php         |  27 ++
 .../Magento/Ups/Model/CarrierTest.php         |  70 ++++++
 .../Ups/_files/ShipmentAcceptResponse.xml     |  14 ++
 .../Ups/_files/ShipmentConfirmRequest.xml     |  94 +++++++
 .../Legacy/_files/copyright/blacklist.php     |   3 +-
 6 files changed, 338 insertions(+), 104 deletions(-)
 create mode 100644 dev/tests/integration/testsuite/Magento/Ups/_files/ShipmentConfirmRequest.xml

diff --git a/app/code/Magento/Ups/Model/Carrier.php b/app/code/Magento/Ups/Model/Carrier.php
index 5b333e2dc2d5c..57ad12a972dab 100644
--- a/app/code/Magento/Ups/Model/Carrier.php
+++ b/app/code/Magento/Ups/Model/Carrier.php
@@ -1361,20 +1361,11 @@ public function getAllowedMethods()
      */
     protected function _formShipmentRequest(DataObject $request)
     {
-        $packageParams = $request->getPackageParams();
-        $height = $packageParams->getHeight();
-        $width = $packageParams->getWidth();
-        $length = $packageParams->getLength();
-        $weightUnits = $packageParams->getWeightUnits() == \Zend_Measure_Weight::POUND ? 'LBS' : 'KGS';
-        $dimensionsUnits = $packageParams->getDimensionUnits() == \Zend_Measure_Length::INCH ? 'IN' : 'CM';
-
-        $itemsDesc = [];
-        $itemsShipment = $request->getPackageItems();
-        foreach ($itemsShipment as $itemShipment) {
-            $item = new DataObject();
-            $item->setData($itemShipment);
-            $itemsDesc[] = $item->getName();
+        $packages = $request->getPackages();
+        foreach ($packages as $package) {
+            $shipmentItems[] = $package['items'];
         }
+        $shipmentItems = array_merge(...$shipmentItems);
 
         $xmlRequest = $this->_xmlElFactory->create(
             ['data' => '<?xml version = "1.0" ?><ShipmentConfirmRequest xml:lang="en-US"/>']
@@ -1389,7 +1380,7 @@ protected function _formShipmentRequest(DataObject $request)
             // UPS Print Return Label
             $returnPart->addChild('Code', '9');
         }
-        $shipmentPart->addChild('Description', substr(implode(' ', $itemsDesc), 0, 35));
+        $shipmentPart->addChild('Description', $this->generateShipmentDescription($shipmentItems));
         //empirical
 
         $shipperPart = $shipmentPart->addChild('Shipper');
@@ -1481,77 +1472,95 @@ protected function _formShipmentRequest(DataObject $request)
 
         $servicePart = $shipmentPart->addChild('Service');
         $servicePart->addChild('Code', $request->getShippingMethod());
-        $packagePart = $shipmentPart->addChild('Package');
-        $packagePart->addChild('Description', substr(implode(' ', $itemsDesc), 0, 35));
-        //empirical
-        $packagePart->addChild('PackagingType')->addChild('Code', $request->getPackagingType());
-        $packageWeight = $packagePart->addChild('PackageWeight');
-        $packageWeight->addChild('Weight', $request->getPackageWeight());
-        $packageWeight->addChild('UnitOfMeasurement')->addChild('Code', $weightUnits);
-
-        // set dimensions
-        if ($length || $width || $height) {
-            $packageDimensions = $packagePart->addChild('Dimensions');
-            $packageDimensions->addChild('UnitOfMeasurement')->addChild('Code', $dimensionsUnits);
-            $packageDimensions->addChild('Length', $length);
-            $packageDimensions->addChild('Width', $width);
-            $packageDimensions->addChild('Height', $height);
-        }
-
-        // ups support reference number only for domestic service
-        if ($this->_isUSCountry($request->getRecipientAddressCountryCode())
-            && $this->_isUSCountry($request->getShipperAddressCountryCode())
-        ) {
-            if ($request->getReferenceData()) {
-                $referenceData = $request->getReferenceData() . $request->getPackageId();
-            } else {
-                $referenceData = 'Order #' .
-                    $request->getOrderShipment()->getOrder()->getIncrementId() .
-                    ' P' .
-                    $request->getPackageId();
+
+        $packagePart = [];
+        $customsTotal = 0;
+        $packagingTypes = [];
+        $deliveryConfirmationLevel = $this->_getDeliveryConfirmationLevel(
+            $request->getRecipientAddressCountryCode()
+        );
+        foreach ($packages as $packageId => $package) {
+            $packageItems = $package['items'];
+            $packageParams = new DataObject($package['params']);
+            $packagingType = $package['params']['container'];
+            $packagingTypes[] = $packagingType;
+            $height = $packageParams->getHeight();
+            $width = $packageParams->getWidth();
+            $length = $packageParams->getLength();
+            $weight = $packageParams->getWeight();
+            $weightUnits = $packageParams->getWeightUnits() == \Zend_Measure_Weight::POUND ? 'LBS' : 'KGS';
+            $dimensionsUnits = $packageParams->getDimensionUnits() == \Zend_Measure_Length::INCH ? 'IN' : 'CM';
+            $deliveryConfirmation = $packageParams->getDeliveryConfirmation();
+            $customsTotal += $packageParams->getCustomsValue();
+
+            $packagePart[$packageId] = $shipmentPart->addChild('Package');
+            $packagePart[$packageId]->addChild('Description', $this->generateShipmentDescription($packageItems));
+            //empirical
+            $packagePart[$packageId]->addChild('PackagingType')->addChild('Code', $packagingType);
+            $packageWeight = $packagePart[$packageId]->addChild('PackageWeight');
+            $packageWeight->addChild('Weight', $weight);
+            $packageWeight->addChild('UnitOfMeasurement')->addChild('Code', $weightUnits);
+
+            // set dimensions
+            if ($length || $width || $height) {
+                $packageDimensions = $packagePart[$packageId]->addChild('Dimensions');
+                $packageDimensions->addChild('UnitOfMeasurement')->addChild('Code', $dimensionsUnits);
+                $packageDimensions->addChild('Length', $length);
+                $packageDimensions->addChild('Width', $width);
+                $packageDimensions->addChild('Height', $height);
             }
-            $referencePart = $packagePart->addChild('ReferenceNumber');
-            $referencePart->addChild('Code', '02');
-            $referencePart->addChild('Value', $referenceData);
-        }
-
-        $deliveryConfirmation = $packageParams->getDeliveryConfirmation();
-        if ($deliveryConfirmation) {
-            /** @var $serviceOptionsNode Element */
-            $serviceOptionsNode = null;
-            switch ($this->_getDeliveryConfirmationLevel($request->getRecipientAddressCountryCode())) {
-                case self::DELIVERY_CONFIRMATION_PACKAGE:
-                    $serviceOptionsNode = $packagePart->addChild('PackageServiceOptions');
-                    break;
-                case self::DELIVERY_CONFIRMATION_SHIPMENT:
-                    $serviceOptionsNode = $shipmentPart->addChild('ShipmentServiceOptions');
-                    break;
-                default:
-                    break;
+
+            // ups support reference number only for domestic service
+            if ($this->_isUSCountry($request->getRecipientAddressCountryCode())
+                && $this->_isUSCountry($request->getShipperAddressCountryCode())
+            ) {
+                if ($request->getReferenceData()) {
+                    $referenceData = $request->getReferenceData() . $packageId;
+                } else {
+                    $referenceData = 'Order #' .
+                        $request->getOrderShipment()->getOrder()->getIncrementId() .
+                        ' P' .
+                        $packageId;
+                }
+                $referencePart = $packagePart[$packageId]->addChild('ReferenceNumber');
+                $referencePart->addChild('Code', '02');
+                $referencePart->addChild('Value', $referenceData);
             }
-            if ($serviceOptionsNode !== null) {
-                $serviceOptionsNode->addChild(
-                    'DeliveryConfirmation'
-                )->addChild(
-                    'DCISType',
-                    $packageParams->getDeliveryConfirmation()
-                );
+
+            if ($deliveryConfirmation && $deliveryConfirmationLevel === self::DELIVERY_CONFIRMATION_PACKAGE) {
+                    $serviceOptionsNode = $packagePart[$packageId]->addChild('PackageServiceOptions');
+                    $serviceOptionsNode->addChild(
+                        'DeliveryConfirmation'
+                    )->addChild(
+                        'DCISType',
+                        $deliveryConfirmation
+                    );
             }
         }
 
+        if (isset($deliveryConfirmation) && $deliveryConfirmationLevel === self::DELIVERY_CONFIRMATION_SHIPMENT) {
+            $serviceOptionsNode = $shipmentPart->addChild('ShipmentServiceOptions');
+            $serviceOptionsNode->addChild(
+                'DeliveryConfirmation'
+            )->addChild(
+                'DCISType',
+                $deliveryConfirmation
+            );
+        }
+
         $shipmentPart->addChild('PaymentInformation')
             ->addChild('Prepaid')
             ->addChild('BillShipper')
             ->addChild('AccountNumber', $this->getConfigData('shipper_number'));
 
-        if ($request->getPackagingType() != $this->configHelper->getCode('container', 'ULE')
+        if (!in_array($this->configHelper->getCode('container', 'ULE'), $packagingTypes)
             && $request->getShipperAddressCountryCode() == self::USA_COUNTRY_ID
             && ($request->getRecipientAddressCountryCode() == 'CA'
                 || $request->getRecipientAddressCountryCode() == 'PR')
         ) {
             $invoiceLineTotalPart = $shipmentPart->addChild('InvoiceLineTotal');
             $invoiceLineTotalPart->addChild('CurrencyCode', $request->getBaseCurrencyCode());
-            $invoiceLineTotalPart->addChild('MonetaryValue', ceil($packageParams->getCustomsValue()));
+            $invoiceLineTotalPart->addChild('MonetaryValue', ceil($customsTotal));
         }
 
         $labelPart = $xmlRequest->addChild('LabelSpecification');
@@ -1561,6 +1570,25 @@ protected function _formShipmentRequest(DataObject $request)
         return $xmlRequest->asXml();
     }
 
+    /**
+     * Generates shipment description.
+     *
+     * @param array $items
+     * @return string
+     */
+    private function generateShipmentDescription(array $items): string
+    {
+        $itemsDesc = [];
+        $itemsShipment = $items;
+        foreach ($itemsShipment as $itemShipment) {
+            $item = new \Magento\Framework\DataObject();
+            $item->setData($itemShipment);
+            $itemsDesc[] = $item->getName();
+        }
+
+        return substr(implode(' ', $itemsDesc), 0, 35);
+    }
+
     /**
      * Send and process shipment accept request
      *
@@ -1638,30 +1666,29 @@ public function getShipAcceptUrl()
     /**
      * Request quotes for given packages.
      *
-     * @param DataObject[] $packages
+     * @param DataObject $request
      * @return string[] Quote IDs.
      * @throws LocalizedException
      * @throws RuntimeException
      */
-    private function requestQuotes(array $packages): array
+    private function requestQuotes(DataObject $request): array
     {
         /** @var HttpResponseDeferredInterface[] $quotesRequests */
-        $quotesRequests = [];
         //Getting quotes
-        foreach ($packages as $package) {
-            $this->_prepareShipmentRequest($package);
-            $rawXmlRequest = $this->_formShipmentRequest($package);
-            $this->setXMLAccessRequest();
-            $xmlRequest = $this->_xmlAccessRequest . $rawXmlRequest;
-            $quotesRequests[] = $this->asyncHttpClient->request(
-                new Request(
-                    $this->getShipConfirmUrl(),
-                    Request::METHOD_POST,
-                    ['Content-Type' => 'application/xml'],
-                    $xmlRequest
-                )
-            );
-        }
+        $this->_prepareShipmentRequest($request);
+        $rawXmlRequest = $this->_formShipmentRequest($request);
+        $this->setXMLAccessRequest();
+        $xmlRequest = $this->_xmlAccessRequest . $rawXmlRequest;
+        $this->_debug(['request_quote' => $this->filterDebugData($this->_xmlAccessRequest) . $rawXmlRequest]);
+        $quotesRequests[] = $this->asyncHttpClient->request(
+            new Request(
+                $this->getShipConfirmUrl(),
+                Request::METHOD_POST,
+                ['Content-Type' => 'application/xml'],
+                $xmlRequest
+            )
+        );
+
         $ids = [];
         //Processing quote responses
         foreach ($quotesRequests as $quotesRequest) {
@@ -1672,6 +1699,7 @@ private function requestQuotes(array $packages): array
             try {
                 /** @var Element $response */
                 $response = $this->_xmlElFactory->create(['data' => $httpResponse->getBody()]);
+                $this->_debug(['response_quote' => $response]);
             } catch (Throwable $e) {
                 throw new RuntimeException($e->getMessage());
             }
@@ -1708,6 +1736,12 @@ private function requestShipments(array $quoteIds): array
             $request->addChild('RequestAction', 'ShipAccept');
             $xmlRequest->addChild('ShipmentDigest', $quoteId);
 
+            $debugRequest = $this->filterDebugData($this->_xmlAccessRequest) . $xmlRequest->asXml();
+            $this->_debug(
+                [
+                    'request_shipment' => $debugRequest
+                ]
+            );
             $shippingRequests[] = $this->asyncHttpClient->request(
                 new Request(
                     $this->getShipAcceptUrl(),
@@ -1721,7 +1755,6 @@ private function requestShipments(array $quoteIds): array
         /** @var DataObject[] $results */
         $results = [];
         foreach ($shippingRequests as $shippingRequest) {
-            $result = new DataObject();
             $httpResponse = $shippingRequest->get();
             if ($httpResponse->getStatusCode() >= 400) {
                 throw new LocalizedException(__('Failed to send the package'));
@@ -1729,19 +1762,23 @@ private function requestShipments(array $quoteIds): array
             try {
                 /** @var Element $response */
                 $response = $this->_xmlElFactory->create(['data' => $httpResponse->getBody()]);
+                $this->_debug(['response_shipment' => $response]);
             } catch (Throwable $e) {
                 throw new RuntimeException($e->getMessage());
             }
             if (isset($response->Error)) {
                 throw new RuntimeException((string)$response->Error->ErrorDescription);
-            } else {
-                $shippingLabelContent = (string)$response->ShipmentResults->PackageResults->LabelImage->GraphicImage;
-                $trackingNumber = (string)$response->ShipmentResults->PackageResults->TrackingNumber;
+            }
+
+            foreach ($response->ShipmentResults->PackageResults as $packageResult) {
+                $result = new DataObject();
+                $shippingLabelContent = (string)$packageResult->LabelImage->GraphicImage;
+                $trackingNumber = (string)$packageResult->TrackingNumber;
                 // phpcs:ignore Magento2.Functions.DiscouragedFunction
                 $result->setLabelContent(base64_decode($shippingLabelContent));
                 $result->setTrackingNumber($trackingNumber);
+                $results[] = $result;
             }
-            $results[] = $result;
         }
 
         return $results;
@@ -1841,25 +1878,16 @@ public function requestToShipment($request)
         if ($request->getStoreId() != null) {
             $this->setStore($request->getStoreId());
         }
-        /** @var Shipment[] $packageRequests */
-        $packageRequests = [];
-        //Preparing packages info.
-        foreach ($packages as $packageId => $package) {
-            $request->setPackageId($packageId);
-            $request->setPackagingType($package['params']['container']);
-            $request->setPackageWeight($package['params']['weight']);
-            $request->setPackageParams(new DataObject($package['params']));
-            $request->setPackageItems($package['items']);
-            $packageRequests[] = clone $request;
-        }
 
         // phpcs:disable
         try {
-            $quoteIds = $this->requestQuotes($packageRequests);
+            $quoteIds = $this->requestQuotes($request);
             $labels = $this->requestShipments($quoteIds);
         } catch (LocalizedException $exception) {
+            $this->_logger->critical($exception);
             return new DataObject(['errors' => [$exception->getMessage()]]);
         } catch (RuntimeException $exception) {
+            $this->_logger->critical($exception);
             return new DataObject(['errors' => __('Failed to send items')]);
         }
         // phpcs:enable
diff --git a/dev/tests/integration/framework/Magento/TestFramework/HTTP/AsyncClientInterfaceMock.php b/dev/tests/integration/framework/Magento/TestFramework/HTTP/AsyncClientInterfaceMock.php
index caef011267bc7..ab0020917a9e9 100644
--- a/dev/tests/integration/framework/Magento/TestFramework/HTTP/AsyncClientInterfaceMock.php
+++ b/dev/tests/integration/framework/Magento/TestFramework/HTTP/AsyncClientInterfaceMock.php
@@ -33,6 +33,11 @@ class AsyncClientInterfaceMock implements AsyncClientInterface
      */
     private $lastRequest;
 
+    /**
+     * @var Request[]
+     */
+    private $requests = [];
+
     /**
      * AsyncClientInterfaceMock constructor.
      * @param GuzzleAsyncClient $client
@@ -63,12 +68,34 @@ public function getLastRequest(): ?Request
         return $this->lastRequest;
     }
 
+    /**
+     * Returns all requests made.
+     *
+     * @return Request[]|null
+     */
+    public function getRequests(): array
+    {
+        return $this->requests;
+    }
+
+    /**
+     * Clear requests.
+     *
+     * @return void
+     */
+    public function clearRequests()
+    {
+        $this->requests = [];
+        $this->lastRequest = null;
+    }
+
     /**
      * @inheritDoc
      */
     public function request(Request $request): HttpResponseDeferredInterface
     {
         $this->lastRequest = $request;
+        $this->requests[] = $request;
         if ($mockResponse = array_shift($this->mockResponses)) {
             return new MockDeferredResponse($mockResponse);
         }
diff --git a/dev/tests/integration/testsuite/Magento/Ups/Model/CarrierTest.php b/dev/tests/integration/testsuite/Magento/Ups/Model/CarrierTest.php
index dfe12f825c3c3..54260ff1b75ee 100644
--- a/dev/tests/integration/testsuite/Magento/Ups/Model/CarrierTest.php
+++ b/dev/tests/integration/testsuite/Magento/Ups/Model/CarrierTest.php
@@ -20,6 +20,8 @@
 
 /**
  * Integration tests for Carrier model class
+ *
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class CarrierTest extends TestCase
 {
@@ -208,6 +210,7 @@ public function collectRatesDataProvider()
     public function testRequestToShipment(): void
     {
         //phpcs:disable Magento2.Functions.DiscouragedFunction
+        $expectedShipmentRequest = file_get_contents(__DIR__ .'/../_files/ShipmentConfirmRequest.xml');
         $shipmentResponse = file_get_contents(__DIR__ .'/../_files/ShipmentConfirmResponse.xml');
         $acceptResponse = file_get_contents(__DIR__ .'/../_files/ShipmentAcceptResponse.xml');
         //phpcs:enable Magento2.Functions.DiscouragedFunction
@@ -217,6 +220,8 @@ public function testRequestToShipment(): void
                 new Response(200, [], $acceptResponse)
             ]
         );
+        $this->httpClient->clearRequests();
+
         $request = new Request(
             [
                 'packages' => [
@@ -237,11 +242,37 @@ public function testRequestToShipment(): void
                             ],
                         ],
                     ],
+                    'package2' => [
+                        'params' => [
+                            'width' => '4',
+                            'length' => '4',
+                            'height' => '4',
+                            'dimension_units' => 'INCH',
+                            'weight_units' => 'POUND',
+                            'weight' => '0.55',
+                            'customs_value' => '20.00',
+                            'container' => 'Large Express Box',
+                        ],
+                        'items' => [
+                            'item2' => [
+                                'name' => 'item2_name',
+                            ],
+                        ],
+                    ],
                 ]
             ]
         );
 
         $result = $this->carrier->requestToShipment($request);
+
+        $requests = $this->httpClient->getRequests();
+        $this->assertNotEmpty($requests);
+        $shipmentRequest = $this->extractShipmentRequest($requests[0]->getBody());
+        $this->assertEquals(
+            $this->formatXml($expectedShipmentRequest),
+            $this->formatXml($shipmentRequest)
+        );
+
         $this->assertEmpty($result->getErrors());
         $this->assertNotEmpty($result->getInfo());
         $this->assertEquals(
@@ -249,5 +280,44 @@ public function testRequestToShipment(): void
             $result->getInfo()[0]['tracking_number'],
             'Tracking Number must match.'
         );
+        $this->assertEquals(
+            '2V467W886398839541',
+            $result->getInfo()[1]['tracking_number'],
+            'Tracking Number must match.'
+        );
+        $this->httpClient->clearRequests();
+    }
+
+    /**
+     * Extracts shipment request.
+     *
+     * @param string $requestBody
+     * @return string
+     */
+    private function extractShipmentRequest(string $requestBody): string
+    {
+        $resultXml = '';
+        $pattern = '%(<\?xml version="1.0"\?>\n<ShipmentConfirmRequest)(.*)$%im';
+        if (preg_match($pattern, $requestBody, $result)) {
+            $resultXml = array_shift($result);
+        }
+
+        return $resultXml;
+    }
+
+    /**
+     * Format XML string.
+     *
+     * @param string $xmlString
+     * @return string
+     */
+    private function formatXml(string $xmlString): string
+    {
+        $xmlDocument = new \DOMDocument('1.0');
+        $xmlDocument->preserveWhiteSpace = false;
+        $xmlDocument->formatOutput = true;
+        $xmlDocument->loadXML($xmlString);
+
+        return $xmlDocument->saveXML();
     }
 }
diff --git a/dev/tests/integration/testsuite/Magento/Ups/_files/ShipmentAcceptResponse.xml b/dev/tests/integration/testsuite/Magento/Ups/_files/ShipmentAcceptResponse.xml
index c15986f6502a5..03b6e1da659db 100644
--- a/dev/tests/integration/testsuite/Magento/Ups/_files/ShipmentAcceptResponse.xml
+++ b/dev/tests/integration/testsuite/Magento/Ups/_files/ShipmentAcceptResponse.xml
@@ -55,5 +55,19 @@
                 <HTMLImage>PCFET0NUWVBFI</HTMLImage>
             </LabelImage>
         </PackageResults>
+        <PackageResults>
+            <TrackingNumber>2V467W886398839541</TrackingNumber>
+            <ServiceOptionsCharges>
+                <CurrencyCode>USD</CurrencyCode>
+                <MonetaryValue>0.00</MonetaryValue>
+            </ServiceOptionsCharges>
+            <LabelImage>
+                <LabelImageFormat>
+                    <Code>GIF</Code>
+                </LabelImageFormat>
+                <GraphicImage>R0lGODdheAUgA</GraphicImage>
+                <HTMLImage>PCFET0NUWVBFI</HTMLImage>
+            </LabelImage>
+        </PackageResults>
     </ShipmentResults>
 </ShipmentAcceptResponse>
diff --git a/dev/tests/integration/testsuite/Magento/Ups/_files/ShipmentConfirmRequest.xml b/dev/tests/integration/testsuite/Magento/Ups/_files/ShipmentConfirmRequest.xml
new file mode 100644
index 0000000000000..63463c087726c
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Ups/_files/ShipmentConfirmRequest.xml
@@ -0,0 +1,94 @@
+<?xml version="1.0"?>
+<ShipmentConfirmRequest xml:lang="en-US">
+<Request>
+    <RequestAction>ShipConfirm</RequestAction>
+    <RequestOption>nonvalidate</RequestOption>
+</Request>
+<Shipment>
+    <Description>item_name item2_name</Description>
+    <Shipper>
+        <Name />
+        <AttentionName />
+        <ShipperNumber>12345</ShipperNumber>
+        <PhoneNumber />
+        <Address>
+            <AddressLine1 />
+            <AddressLine2 />
+            <City />
+            <CountryCode />
+            <PostalCode />
+        </Address>
+    </Shipper>
+    <ShipTo>
+        <AttentionName />
+        <CompanyName>N/A</CompanyName>
+        <PhoneNumber />
+        <Address>
+            <AddressLine1 />
+            <AddressLine2 />
+            <City />
+            <CountryCode />
+            <PostalCode />
+            <ResidentialAddress />
+        </Address>
+    </ShipTo>
+    <Service>
+        <Code />
+    </Service>
+    <Package>
+        <Description>item_name</Description>
+        <PackagingType>
+            <Code>Small Express Box</Code>
+        </PackagingType>
+        <PackageWeight>
+            <Weight>0.454000000001</Weight>
+            <UnitOfMeasurement>
+                <Code>LBS</Code>
+            </UnitOfMeasurement>
+        </PackageWeight>
+        <Dimensions>
+            <UnitOfMeasurement>
+                <Code>IN</Code>
+            </UnitOfMeasurement>
+            <Length>3</Length>
+            <Width>3</Width>
+            <Height>3</Height>
+        </Dimensions>
+    </Package>
+    <Package>
+        <Description>item2_name</Description>
+        <PackagingType>
+            <Code>Large Express Box</Code>
+        </PackagingType>
+        <PackageWeight>
+            <Weight>0.55</Weight>
+            <UnitOfMeasurement>
+                <Code>LBS</Code>
+            </UnitOfMeasurement>
+        </PackageWeight>
+        <Dimensions>
+            <UnitOfMeasurement>
+                <Code>IN</Code>
+            </UnitOfMeasurement>
+            <Length>4</Length>
+            <Width>4</Width>
+            <Height>4</Height>
+        </Dimensions>
+    </Package>
+    <PaymentInformation>
+        <Prepaid>
+            <BillShipper>
+                <AccountNumber>12345</AccountNumber>
+            </BillShipper>
+        </Prepaid>
+    </PaymentInformation>
+</Shipment>
+<LabelSpecification>
+    <LabelPrintMethod>
+        <Code>GIF</Code>
+    </LabelPrintMethod>
+    <LabelImageFormat>
+        <Code>GIF</Code>
+    </LabelImageFormat>
+</LabelSpecification>
+</ShipmentConfirmRequest>
diff --git a/dev/tests/static/testsuite/Magento/Test/Legacy/_files/copyright/blacklist.php b/dev/tests/static/testsuite/Magento/Test/Legacy/_files/copyright/blacklist.php
index 48eb64ffea27e..50397b70ea925 100644
--- a/dev/tests/static/testsuite/Magento/Test/Legacy/_files/copyright/blacklist.php
+++ b/dev/tests/static/testsuite/Magento/Test/Legacy/_files/copyright/blacklist.php
@@ -10,5 +10,6 @@
     '/setup\/src\/Zend\/Mvc\/Controller\/LazyControllerAbstractFactory\.php/',
     '/app\/code\/(?!Magento)[^\/]*/',
     '#dev/tests/setup-integration/testsuite/Magento/Developer/_files/\S*\.xml$#',
-    '/lib\/internal\/Magento\/Framework\/File\/Test\/Unit\/_files\/blank.html$/'
+    '/lib\/internal\/Magento\/Framework\/File\/Test\/Unit\/_files\/blank.html$/',
+    '/dev\/tests\/integration\/testsuite\/Magento\/Ups\/_files\/ShipmentConfirmRequest.xml$/'
 ];

From 45085db149f474ca8b2570ee536383b589ee67e7 Mon Sep 17 00:00:00 2001
From: Nikita Shcherbatykh <nikita.shcherbatykh@transoftgroup.com>
Date: Tue, 5 May 2020 14:16:34 +0300
Subject: [PATCH 071/120] MC-33406: Related Products Price Box is updating
 unexceptionally.

---
 .../ConfigurableProduct/view/frontend/web/js/configurable.js    | 2 +-
 app/code/Magento/Swatches/view/base/web/js/swatch-renderer.js   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

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 8fd1d761040d7..f705b6a95987c 100644
--- a/app/code/Magento/ConfigurableProduct/view/frontend/web/js/configurable.js
+++ b/app/code/Magento/ConfigurableProduct/view/frontend/web/js/configurable.js
@@ -33,7 +33,7 @@ define([
             mediaGallerySelector: '[data-gallery-role=gallery-placeholder]',
             mediaGalleryInitial: null,
             slyOldPriceSelector: '.sly-old-price',
-            normalPriceLabelSelector: '.normal-price .price-label',
+            normalPriceLabelSelector: '.product-info-main .normal-price .price-label',
 
             /**
              * Defines the mechanism of how images of a gallery should be
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 a45ee933584ba..3a4e33650cb4f 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
@@ -278,7 +278,7 @@ define([
             // tier prise selectors end
 
             // A price label selector
-            normalPriceLabelSelector: '.normal-price .price-label'
+            normalPriceLabelSelector: '.product-info-main .normal-price .price-label'
         },
 
         /**

From b385e3094ea7bd392c8e6db0063d219f4d7c9f39 Mon Sep 17 00:00:00 2001
From: Serhii Balko <serhii.balko@transoftgroup.com>
Date: Tue, 5 May 2020 14:23:42 +0300
Subject: [PATCH 072/120] MC-33147: Most Tier Prices not Visible on
 Configurable variations

---
 ...ConfigurableProductSwatchTierPriceTest.xml | 84 +++++++++++++++++++
 .../view/base/web/js/swatch-renderer.js       | 17 +---
 2 files changed, 87 insertions(+), 14 deletions(-)
 create mode 100644 app/code/Magento/Swatches/Test/Mftf/Test/StorefrontConfigurableProductSwatchTierPriceTest.xml

diff --git a/app/code/Magento/Swatches/Test/Mftf/Test/StorefrontConfigurableProductSwatchTierPriceTest.xml b/app/code/Magento/Swatches/Test/Mftf/Test/StorefrontConfigurableProductSwatchTierPriceTest.xml
new file mode 100644
index 0000000000000..b3fa367313789
--- /dev/null
+++ b/app/code/Magento/Swatches/Test/Mftf/Test/StorefrontConfigurableProductSwatchTierPriceTest.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="StorefrontConfigurableProductSwatchTierPriceTest">
+        <annotations>
+            <features value="Swatches"/>
+            <stories value="Configurable product with swatch attribute"/>
+            <title value="Swatch option should show the tier price on product page"/>
+            <description value="Configurable product with swatch attribute should show the tier price on product page"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MC-34033"/>
+            <useCaseId value="MC-33147"/>
+            <group value="Swatches"/>
+        </annotations>
+        <before>
+            <!-- Create configurable product -->
+            <createData entity="ApiCategory" stepKey="createCategory"/>
+            <createData entity="ApiConfigurableProduct" stepKey="createConfigurableProduct">
+                <requiredEntity createDataKey="createCategory"/>
+            </createData>
+            <!-- Login as Admin -->
+            <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
+        </before>
+        <after>
+            <!-- Delete configurable product -->
+            <deleteData createDataKey="createConfigurableProduct" stepKey="deleteConfigurableProduct"/>
+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
+            <!-- Delete color attribute -->
+            <actionGroup ref="DeleteProductAttributeActionGroup" stepKey="deleteColorAttribute">
+                <argument name="ProductAttribute" value="ProductColorAttribute"/>
+            </actionGroup>
+            <!-- Logout -->
+            <actionGroup ref="AdminLogoutActionGroup" stepKey="adminLogout"/>
+        </after>
+
+        <!-- Create text swatch attribute with 3 options: Black, White and Blue -->
+        <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>
+        <!-- Open configurable product edit page -->
+        <amOnPage url="{{AdminProductEditPage.url($createConfigurableProduct.id$)}}" stepKey="goToConfigurableProduct"/>
+        <!-- Generate configurations for configurable product -->
+        <actionGroup ref="GenerateConfigurationsByAttributeCodeActionGroup" stepKey="createProductConfigurations">
+            <argument name="attributeCode" value="{{ProductColorAttribute.attribute_code}}"/>
+        </actionGroup>
+        <actionGroup ref="SaveConfigurableProductAddToCurrentAttributeSetActionGroup" stepKey="saveConfigurableProduct"/>
+        <!-- Set Tier Price to one of configuration product -->
+        <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"/>
+        <!-- Go to storefront product page -->
+        <actionGroup ref="StorefrontOpenProductPageActionGroup" stepKey="openConfigurableProductPage">
+            <argument name="productUrl" value="$createConfigurableProduct.custom_attributes[url_key]$"/>
+        </actionGroup>
+        <waitForPageLoad stepKey="waitForConfigurableProductPage"/>
+        <!-- Select White configuration -->
+        <actionGroup ref="StorefrontSelectSwatchOptionOnProductPageActionGroup" stepKey="selectWhiteOption">
+            <argument name="optionName" value="White"/>
+        </actionGroup>
+        <!-- Assert tier price on selected configuration -->
+        <actionGroup ref="AssertStorefrontProductDetailPageTierPriceActionGroup" stepKey="assertProductTierPriceText">
+            <argument name="tierProductPriceDiscountQuantity" value="5"/>
+            <argument name="productPriceWithAppliedTierPriceDiscount" value="61.50"/>
+            <argument name="productSavedPricePercent" value="50"/>
+        </actionGroup>
+    </test>
+</tests>
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 a45ee933584ba..9773ab61e9b94 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
@@ -1018,22 +1018,11 @@ define([
          */
         _getNewPrices: function () {
             var $widget = this,
-                optionPriceDiff = 0,
-                allowedProduct = this._getAllowedProductWithMinPrice(this._CalcProducts()),
-                optionPrices = this.options.jsonConfig.optionPrices,
-                basePrice = parseFloat(this.options.jsonConfig.prices.basePrice.amount),
-                optionFinalPrice,
-                newPrices;
+                newPrices = $widget.options.jsonConfig.prices,
+                allowedProduct = this._getAllowedProductWithMinPrice(this._CalcProducts());
 
             if (!_.isEmpty(allowedProduct)) {
-                optionFinalPrice = parseFloat(optionPrices[allowedProduct].finalPrice.amount);
-                optionPriceDiff = optionFinalPrice - basePrice;
-            }
-
-            if (optionPriceDiff !== 0) {
-                newPrices  = this.options.jsonConfig.optionPrices[allowedProduct];
-            } else {
-                newPrices = $widget.options.jsonConfig.prices;
+                newPrices = this.options.jsonConfig.optionPrices[allowedProduct];
             }
 
             return newPrices;

From 101897c129bc0eea2dfcc23e48efb125d61fae2f Mon Sep 17 00:00:00 2001
From: engcom-Echo <engcom-vendorworker-echo@adobe.com>
Date: Tue, 5 May 2020 16:08:34 +0300
Subject: [PATCH 073/120] Cover change

---
 .../Setup/Patch/Data/AddDataForBulgaria.php   | 24 ++++++-------------
 .../Magento/Directory/Model/RegionTest.php    |  3 ++-
 2 files changed, 9 insertions(+), 18 deletions(-)

diff --git a/app/code/Magento/Directory/Setup/Patch/Data/AddDataForBulgaria.php b/app/code/Magento/Directory/Setup/Patch/Data/AddDataForBulgaria.php
index d4b3f22823a66..7f0e401927a41 100644
--- a/app/code/Magento/Directory/Setup/Patch/Data/AddDataForBulgaria.php
+++ b/app/code/Magento/Directory/Setup/Patch/Data/AddDataForBulgaria.php
@@ -3,23 +3,19 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
 declare(strict_types=1);
 
 namespace Magento\Directory\Setup\Patch\Data;
 
 use Magento\Directory\Setup\DataInstaller;
-use Magento\Framework\App\ResourceConnection;
+use Magento\Directory\Setup\DataInstallerFactory;
 use Magento\Framework\Setup\ModuleDataSetupInterface;
 use Magento\Framework\Setup\Patch\DataPatchInterface;
-use Magento\Framework\Setup\Patch\PatchVersionInterface;
 
 /**
  * Add Bulgaria States
- * 
- * Class AddDataForBulgaria
  */
-class AddDataForBulgaria implements DataPatchInterface, PatchVersionInterface
+class AddDataForBulgaria implements DataPatchInterface
 {
     /**
      * @var ModuleDataSetupInterface
@@ -27,7 +23,7 @@ class AddDataForBulgaria implements DataPatchInterface, PatchVersionInterface
     private $moduleDataSetup;
 
     /**
-     * @var \Magento\Directory\Setup\DataInstallerFactory
+     * @var DataInstallerFactory
      */
     private $dataInstallerFactory;
 
@@ -35,11 +31,11 @@ class AddDataForBulgaria implements DataPatchInterface, PatchVersionInterface
      * AddDataForBulgaria constructor.
      *
      * @param ModuleDataSetupInterface $moduleDataSetup
-     * @param \Magento\Directory\Setup\DataInstallerFactory $dataInstallerFactory
+     * @param DataInstallerFactory $dataInstallerFactory
      */
     public function __construct(
         ModuleDataSetupInterface $moduleDataSetup,
-        \Magento\Directory\Setup\DataInstallerFactory $dataInstallerFactory
+        DataInstallerFactory $dataInstallerFactory
     ) {
         $this->moduleDataSetup = $moduleDataSetup;
         $this->dataInstallerFactory = $dataInstallerFactory;
@@ -56,6 +52,8 @@ public function apply()
             $this->moduleDataSetup->getConnection(),
             $this->getDataForBulgaria()
         );
+
+        return $this;
     }
 
     /**
@@ -107,14 +105,6 @@ public static function getDependencies()
         ];
     }
 
-    /**
-     * @inheritdoc
-     */
-    public static function getVersion()
-    {
-        return '';
-    }
-
     /**
      * @inheritdoc
      */
diff --git a/dev/tests/integration/testsuite/Magento/Directory/Model/RegionTest.php b/dev/tests/integration/testsuite/Magento/Directory/Model/RegionTest.php
index e0e790b265572..495ff3ded2f53 100644
--- a/dev/tests/integration/testsuite/Magento/Directory/Model/RegionTest.php
+++ b/dev/tests/integration/testsuite/Magento/Directory/Model/RegionTest.php
@@ -56,7 +56,8 @@ public function getCountryIdDataProvider():array
             ['countryId' => 'CO'],
             ['countryId' => 'MX'],
             ['countryId' => 'PL'],
-            ['countryId' => 'IT']
+            ['countryId' => 'IT'],
+            ['countryId' => 'BG']
         ];
     }
 }

From f1e558cd2cf13a574b4853fa478c40fd00fb4cbb Mon Sep 17 00:00:00 2001
From: "vadim.malesh" <engcom-vendorworker-charlie@adobe.com>
Date: Tue, 5 May 2020 16:36:37 +0300
Subject: [PATCH 074/120] add translate

---
 .../Magento/Weee/view/frontend/layout/checkout_index_index.xml  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/Weee/view/frontend/layout/checkout_index_index.xml b/app/code/Magento/Weee/view/frontend/layout/checkout_index_index.xml
index f37f3564bda90..4b3adc8a6091e 100644
--- a/app/code/Magento/Weee/view/frontend/layout/checkout_index_index.xml
+++ b/app/code/Magento/Weee/view/frontend/layout/checkout_index_index.xml
@@ -23,7 +23,7 @@
                                                         <item name="weee" xsi:type="array">
                                                             <item name="component" xsi:type="string">Magento_Weee/js/view/checkout/summary/weee</item>
                                                             <item name="config" xsi:type="array">
-                                                                <item name="title" xsi:type="string">FPT</item>
+                                                                <item name="title" translate="true" xsi:type="string">FPT</item>
                                                             </item>
                                                         </item>
                                                     </item>

From 5b094e6d552c4c39520657e30e2bf374a6967d6a Mon Sep 17 00:00:00 2001
From: Dmitry Tsymbal <d.tsymbal@atwix.com>
Date: Tue, 5 May 2020 20:39:27 +0300
Subject: [PATCH 075/120] Admin-Delete-Cms-Page-Test

---
 .../AdminDeleteCmsPageFromGridActionGroup.xml | 21 +++++++++
 ...SearchCmsPageInGridByUrlKeyActionGroup.xml | 20 ++++++++
 ...sertAdminCmsPageIsNotInGridActionGroup.xml | 17 +++++++
 .../Section/CmsPagesPageActionsSection.xml    |  1 +
 .../Test/Mftf/Test/AdminDeleteCmsPageTest.xml | 47 +++++++++++++++++++
 5 files changed, 106 insertions(+)
 create mode 100644 app/code/Magento/Cms/Test/Mftf/ActionGroup/AdminDeleteCmsPageFromGridActionGroup.xml
 create mode 100644 app/code/Magento/Cms/Test/Mftf/ActionGroup/AdminSearchCmsPageInGridByUrlKeyActionGroup.xml
 create mode 100644 app/code/Magento/Cms/Test/Mftf/ActionGroup/AssertAdminCmsPageIsNotInGridActionGroup.xml
 create mode 100644 app/code/Magento/Cms/Test/Mftf/Test/AdminDeleteCmsPageTest.xml

diff --git a/app/code/Magento/Cms/Test/Mftf/ActionGroup/AdminDeleteCmsPageFromGridActionGroup.xml b/app/code/Magento/Cms/Test/Mftf/ActionGroup/AdminDeleteCmsPageFromGridActionGroup.xml
new file mode 100644
index 0000000000000..2bd81104c7560
--- /dev/null
+++ b/app/code/Magento/Cms/Test/Mftf/ActionGroup/AdminDeleteCmsPageFromGridActionGroup.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="AdminDeleteCmsPageFromGridActionGroup">
+        <arguments>
+            <argument name="urlKey" type="string"/>
+        </arguments>
+        <click selector="{{CmsPagesPageActionsSection.select(urlKey)}}" stepKey="clickSelect"/>
+        <click selector="{{CmsPagesPageActionsSection.delete(urlKey)}}" stepKey="clickDelete"/>
+        <waitForElementVisible selector="{{CmsPagesPageActionsSection.deleteConfirm}}" stepKey="waitForOkButtonToBeVisible"/>
+        <click selector="{{CmsPagesPageActionsSection.deleteConfirm}}" stepKey="clickOkButton"/>
+        <waitForPageLoad stepKey="waitForPageLoad3"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Cms/Test/Mftf/ActionGroup/AdminSearchCmsPageInGridByUrlKeyActionGroup.xml b/app/code/Magento/Cms/Test/Mftf/ActionGroup/AdminSearchCmsPageInGridByUrlKeyActionGroup.xml
new file mode 100644
index 0000000000000..d18d92efbe757
--- /dev/null
+++ b/app/code/Magento/Cms/Test/Mftf/ActionGroup/AdminSearchCmsPageInGridByUrlKeyActionGroup.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="AdminSearchCmsPageInGridByUrlKeyActionGroup">
+        <arguments>
+            <argument name="urlKey" type="string"/>
+        </arguments>
+        <click selector="{{CmsPagesPageActionsSection.filterButton}}" stepKey="clickFilterButton"/>
+        <fillField selector="{{CmsPagesPageActionsSection.URLKey}}" userInput="{{urlKey}}" stepKey="fillUrlKeyField"/>
+        <click selector="{{CmsPagesPageActionsSection.ApplyFiltersBtn}}" stepKey="clickApplyFiltersButton"/>
+        <waitForPageLoad stepKey="waitForPageLoading"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Cms/Test/Mftf/ActionGroup/AssertAdminCmsPageIsNotInGridActionGroup.xml b/app/code/Magento/Cms/Test/Mftf/ActionGroup/AssertAdminCmsPageIsNotInGridActionGroup.xml
new file mode 100644
index 0000000000000..7884a9d865a2d
--- /dev/null
+++ b/app/code/Magento/Cms/Test/Mftf/ActionGroup/AssertAdminCmsPageIsNotInGridActionGroup.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="AssertAdminCmsPageIsNotInGridActionGroup">
+        <arguments>
+            <argument name="urlKey" type="string"/>
+        </arguments>
+        <dontSee userInput="{{urlKey}}" selector="{{CmsPagesPageActionsSection.gridDataRow}}" stepKey="dontSeeCmsPageInGrid"/>
+    </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..6f16fa54a6ebf 100644
--- a/app/code/Magento/Cms/Test/Mftf/Section/CmsPagesPageActionsSection.xml
+++ b/app/code/Magento/Cms/Test/Mftf/Section/CmsPagesPageActionsSection.xml
@@ -30,5 +30,6 @@
         <element name="pageRowCheckboxByIdentifier" type="checkbox" selector="//table[@data-role='grid']//td[count(../../..//th[./*[.='URL Key']]/preceding-sibling::th) + 1][./*[.='{{identifier}}']]/../td//input[@data-action='select-row']"  parameterized="true" />
         <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"/>
     </section>
 </sections>
diff --git a/app/code/Magento/Cms/Test/Mftf/Test/AdminDeleteCmsPageTest.xml b/app/code/Magento/Cms/Test/Mftf/Test/AdminDeleteCmsPageTest.xml
new file mode 100644
index 0000000000000..bf165496e8d41
--- /dev/null
+++ b/app/code/Magento/Cms/Test/Mftf/Test/AdminDeleteCmsPageTest.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="AdminDeleteCmsPageTest">
+        <annotations>
+            <features value="Cms"/>
+            <stories value="Delete a CMS Page via the Admin"/>
+            <title value="Admin should be able to delete CMS Pages"/>
+            <description value="Admin should be able to delete CMS Pages"/>
+            <group value="Cms"/>
+            <group value="WYSIWYGDisabled"/>
+        </annotations>
+
+        <before>
+            <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
+            <actionGroup ref="AdminNavigateToPageGridActionGroup" stepKey="navigateToCmsPageGrid"/>
+            <actionGroup ref="CreateNewPageWithBasicValues" stepKey="createNewPageWithBasicValues"/>
+            <actionGroup ref="SaveCmsPageActionGroup" stepKey="clickSaveCmsPageButton"/>
+        </before>
+        <after>
+            <actionGroup ref="AdminLogoutActionGroup" stepKey="adminLogout"/>
+        </after>
+
+        <actionGroup ref="AdminSearchCmsPageInGridByUrlKeyActionGroup" stepKey="findCreatedCmsPage">
+            <argument name="urlKey" value="{{_defaultCmsPage.identifier}}"/>
+        </actionGroup>
+        <actionGroup ref="AdminDeleteCmsPageFromGridActionGroup" stepKey="deleteCmsPage">
+            <argument name="urlKey" value="{{_defaultCmsPage.identifier}}"/>
+        </actionGroup>
+        <actionGroup ref="AssertMessageInAdminPanelActionGroup" stepKey="assertSuccessMessage">
+            <argument name="message" value="The page has been deleted."/>
+        </actionGroup>
+        <actionGroup ref="AdminSearchCmsPageInGridByUrlKeyActionGroup" stepKey="searchDeletedPage">
+            <argument name="urlKey" value="{{_defaultCmsPage.identifier}}"/>
+        </actionGroup>
+        <actionGroup ref="AssertAdminCmsPageIsNotInGridActionGroup" stepKey="assertCmsPageIsNotInGrid">
+            <argument name="urlKey" value="{{_defaultCmsPage.identifier}}"/>
+        </actionGroup>
+    </test>
+</tests>

From 7f8693d1b34697bc1be5fd8457af32728703fe5e Mon Sep 17 00:00:00 2001
From: Serhiy Yelahin <serhiy.yelahin@transoftgroup.com>
Date: Wed, 6 May 2020 10:01:30 +0300
Subject: [PATCH 076/120] MC-33522: [Magento Cloud] - Saving removed Customer
 via Admin generates a report

---
 .../Controller/Adminhtml/Index/Save.php       |  6 +++++
 .../Controller/Adminhtml/Index/SaveTest.php   | 26 +++++++++++++++++++
 2 files changed, 32 insertions(+)

diff --git a/app/code/Magento/Customer/Controller/Adminhtml/Index/Save.php b/app/code/Magento/Customer/Controller/Adminhtml/Index/Save.php
index a65bfa5d77f9e..12076dc43bd6b 100644
--- a/app/code/Magento/Customer/Controller/Adminhtml/Index/Save.php
+++ b/app/code/Magento/Customer/Controller/Adminhtml/Index/Save.php
@@ -380,6 +380,12 @@ public function execute()
                 $this->_coreRegistry->register(RegistryConstants::CURRENT_CUSTOMER_ID, $customerId);
                 $this->messageManager->addSuccessMessage(__('You saved the customer.'));
                 $returnToEdit = (bool)$this->getRequest()->getParam('back', false);
+            } catch (NoSuchEntityException $exception) {
+                $this->messageManager->addExceptionMessage(
+                    $exception,
+                    __('Something went wrong while saving the customer.')
+                );
+                $returnToEdit = false;
             } catch (\Magento\Framework\Validator\Exception $exception) {
                 $messages = $exception->getMessages();
                 if (empty($messages)) {
diff --git a/dev/tests/integration/testsuite/Magento/Customer/Controller/Adminhtml/Index/SaveTest.php b/dev/tests/integration/testsuite/Magento/Customer/Controller/Adminhtml/Index/SaveTest.php
index f532e2fcb7182..44bc1365fbf0d 100644
--- a/dev/tests/integration/testsuite/Magento/Customer/Controller/Adminhtml/Index/SaveTest.php
+++ b/dev/tests/integration/testsuite/Magento/Customer/Controller/Adminhtml/Index/SaveTest.php
@@ -222,6 +222,32 @@ public function createCustomerErrorsProvider(): array
         ];
     }
 
+    /**
+     * Update customer with exceptions
+     *
+     * @magentoDbIsolation enabled
+     *
+     * @return void
+     */
+    public function testUpdateCustomerErrors(): void
+    {
+        $postData = [
+            'customer' => [
+                CustomerData::FIRSTNAME => 'John',
+                CustomerData::LASTNAME => 'Doe',
+            ],
+            'subscription' => '1',
+        ];
+        $expectedMessages = [(string)__('Something went wrong while saving the customer.')];
+        $postData['customer']['entity_id'] = -1;
+        $params = ['back' => true];
+        $this->dispatchCustomerSave($postData, $params);
+        $this->assertSessionMessages(
+            $this->equalTo($expectedMessages),
+            MessageInterface::TYPE_ERROR
+        );
+    }
+
     /**
      * Update customer with subscription and redirect to edit page.
      *

From 2d10f40deafbb7ada74af9e03d8f91979c2c7aba Mon Sep 17 00:00:00 2001
From: Serhiy Yelahin <serhiy.yelahin@transoftgroup.com>
Date: Wed, 6 May 2020 13:25:51 +0300
Subject: [PATCH 077/120] MC-33522: [Magento Cloud] - Saving removed Customer
 via Admin generates a report

---
 .../Customer/Controller/Adminhtml/Index/SaveTest.php     | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/dev/tests/integration/testsuite/Magento/Customer/Controller/Adminhtml/Index/SaveTest.php b/dev/tests/integration/testsuite/Magento/Customer/Controller/Adminhtml/Index/SaveTest.php
index 44bc1365fbf0d..66ed1623c7c97 100644
--- a/dev/tests/integration/testsuite/Magento/Customer/Controller/Adminhtml/Index/SaveTest.php
+++ b/dev/tests/integration/testsuite/Magento/Customer/Controller/Adminhtml/Index/SaveTest.php
@@ -22,6 +22,7 @@
 use Magento\Store\Model\Store;
 use Magento\Store\Model\StoreManagerInterface;
 use Magento\TestFramework\TestCase\AbstractBackendController;
+use PHPUnit\Framework\MockObject\MockObject;
 
 /**
  * Tests for save customer via backend/customer/index/save controller.
@@ -534,7 +535,7 @@ private function assertCustomerSubscription(
      * @param array $sender
      * @param int $customerId
      * @param string|null $newEmail
-     * @return \PHPUnit_Framework_MockObject_MockObject
+     * @return MockObject
      */
     private function prepareEmailMock(
         int $occurrenceNumber,
@@ -542,7 +543,7 @@ private function prepareEmailMock(
         array $sender,
         int $customerId,
         $newEmail = null
-    ) : \PHPUnit_Framework_MockObject_MockObject {
+    ) : MockObject {
         $area = Area::AREA_FRONTEND;
         $customer = $this->customerRepository->getById($customerId);
         $storeId = $customer->getStoreId();
@@ -590,12 +591,12 @@ private function prepareEmailMock(
     /**
      * Add email mock to class
      *
-     * @param \PHPUnit_Framework_MockObject_MockObject $transportBuilderMock
+     * @param MockObject $transportBuilderMock
      * @param string $className
      * @return void
      */
     private function addEmailMockToClass(
-        \PHPUnit_Framework_MockObject_MockObject $transportBuilderMock,
+        MockObject $transportBuilderMock,
         $className
     ): void {
         $mocked = $this->_objectManager->create(

From b7ff624737a78f3a09a8b92ea7a691c621fb1153 Mon Sep 17 00:00:00 2001
From: Lukasz Bajsarowicz <lukasz.bajsarowicz@gmail.com>
Date: Wed, 6 May 2020 13:20:18 +0200
Subject: [PATCH 078/120] Introduce negative `sortOrder` to run the JS defer
 BEFORE caching mechanism (in `Magento/PageCache/etc/frontend/di.xml:15`)

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

diff --git a/app/code/Magento/Theme/etc/frontend/di.xml b/app/code/Magento/Theme/etc/frontend/di.xml
index 915765de7be68..d3e5c07861c84 100644
--- a/app/code/Magento/Theme/etc/frontend/di.xml
+++ b/app/code/Magento/Theme/etc/frontend/di.xml
@@ -30,7 +30,7 @@
         <plugin name="asyncCssLoad" type="Magento\Theme\Controller\Result\AsyncCssPlugin"/>
     </type>
     <type name="Magento\Framework\View\Result\Layout">
-        <plugin name="result-js-footer" type="Magento\Theme\Controller\Result\JsFooterPlugin"/>
+        <plugin name="deferJsToFooter" type="Magento\Theme\Controller\Result\JsFooterPlugin" sortOrder="-10"/>
     </type>
     <type name="Magento\Theme\Block\Html\Header\CriticalCss">
         <arguments>

From e483d0bf6a5ff2fef8f21325b3cb50be783fde9a Mon Sep 17 00:00:00 2001
From: Sathish <srsathish92@gmail.com>
Date: Tue, 5 May 2020 23:31:01 +0530
Subject: [PATCH 079/120] Removed LoginToStorefrontActionGroup legacy action
 group

---
 ...oductWithCustomOptionsWithLongValuesTitleTest.xml | 10 +++++-----
 .../Test/StorefrontDeleteCustomerAddressTest.xml     |  9 +++++----
 .../Test/StorefrontPersistedCustomerLoginTest.xml    | 10 +++++-----
 ...eProductChildImageShouldBeShownOnWishListTest.xml | 10 +++++-----
 .../Test/StorefrontDeletePersistedWishlistTest.xml   | 12 +++++-------
 5 files changed, 25 insertions(+), 26 deletions(-)

diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontPurchaseProductWithCustomOptionsWithLongValuesTitleTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontPurchaseProductWithCustomOptionsWithLongValuesTitleTest.xml
index fbecc15a59b1f..95e48e63419d3 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontPurchaseProductWithCustomOptionsWithLongValuesTitleTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontPurchaseProductWithCustomOptionsWithLongValuesTitleTest.xml
@@ -41,11 +41,11 @@
         </after>
 
         <!-- Login Customer Storefront -->
-
-        <amOnPage url="{{StorefrontCustomerSignInPage.url}}" stepKey="amOnSignInPage"/>
-        <fillField  userInput="$$createCustomer.email$$" selector="{{StorefrontCustomerSignInFormSection.emailField}}" stepKey="fillEmail"/>
-        <fillField userInput="$$createCustomer.password$$" selector="{{StorefrontCustomerSignInFormSection.passwordField}}" stepKey="fillPassword"/>
-        <click selector="{{StorefrontCustomerSignInFormSection.signInAccountButton}}" stepKey="clickSignInAccountButton"/>
+        <actionGroup ref="StorefrontOpenCustomerLoginPageActionGroup" stepKey="goToSignInPage"/>
+        <actionGroup ref="StorefrontFillCustomerLoginFormActionGroup" stepKey="fillLoginFormWithCorrectCredentials">
+            <argument name="customer" value="$$createCustomer$$"/>
+        </actionGroup>
+        <actionGroup ref="StorefrontClickSignOnCustomerLoginFormActionGroup" stepKey="clickSignInAccountButton" />
 
         <!-- Checking the correctness of displayed prices for user parameters -->
 
diff --git a/app/code/Magento/Customer/Test/Mftf/Test/StorefrontDeleteCustomerAddressTest.xml b/app/code/Magento/Customer/Test/Mftf/Test/StorefrontDeleteCustomerAddressTest.xml
index fb08a07a7c319..51efd4e23f5d3 100644
--- a/app/code/Magento/Customer/Test/Mftf/Test/StorefrontDeleteCustomerAddressTest.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Test/StorefrontDeleteCustomerAddressTest.xml
@@ -23,10 +23,11 @@
         <after>
             <deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/>
         </after>
-        <amOnPage stepKey="amOnSignInPage"  url="{{StorefrontCustomerSignInPage.url}}"/>
-        <fillField  stepKey="fillEmail" userInput="$$createCustomer.email$$" selector="{{StorefrontCustomerSignInFormSection.emailField}}"/>
-        <fillField  stepKey="fillPassword" userInput="$$createCustomer.password$$" selector="{{StorefrontCustomerSignInFormSection.passwordField}}"/>
-        <click stepKey="clickSignInAccountButton" selector="{{StorefrontCustomerSignInFormSection.signInAccountButton}}"/>
+        <actionGroup ref="StorefrontOpenCustomerLoginPageActionGroup" stepKey="goToSignInPage"/>
+        <actionGroup ref="StorefrontFillCustomerLoginFormActionGroup" stepKey="fillLoginFormWithCorrectCredentials">
+            <argument name="customer" value="$$createCustomer$$"/>
+        </actionGroup>
+        <actionGroup ref="StorefrontClickSignOnCustomerLoginFormActionGroup" stepKey="clickSignInAccountButton" />
         <actionGroup ref="EnterCustomerAddressInfoActionGroup" stepKey="enterAddressInfo">
             <argument name="Address" value="US_Address_NY"/>
         </actionGroup>
diff --git a/app/code/Magento/Customer/Test/Mftf/Test/StorefrontPersistedCustomerLoginTest.xml b/app/code/Magento/Customer/Test/Mftf/Test/StorefrontPersistedCustomerLoginTest.xml
index 250da68786688..7845d3cee44ef 100644
--- a/app/code/Magento/Customer/Test/Mftf/Test/StorefrontPersistedCustomerLoginTest.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Test/StorefrontPersistedCustomerLoginTest.xml
@@ -24,11 +24,11 @@
         <after>
             <deleteData stepKey="deleteCustomer" createDataKey="customer" />
         </after>
-
-        <amOnPage stepKey="amOnSignInPage"  url="{{StorefrontCustomerSignInPage.url}}"/>
-        <fillField  stepKey="fillEmail" userInput="$$customer.email$$" selector="{{StorefrontCustomerSignInFormSection.emailField}}"/>
-        <fillField  stepKey="fillPassword" userInput="$$customer.password$$" selector="{{StorefrontCustomerSignInFormSection.passwordField}}"/>
-        <click stepKey="clickSignInAccountButton" selector="{{StorefrontCustomerSignInFormSection.signInAccountButton}}"/>
+        <actionGroup ref="StorefrontOpenCustomerLoginPageActionGroup" stepKey="goToSignInPage"/>
+        <actionGroup ref="StorefrontFillCustomerLoginFormActionGroup" stepKey="fillLoginFormWithCorrectCredentials">
+            <argument name="customer" value="$$customer$$"/>
+        </actionGroup>
+        <actionGroup ref="StorefrontClickSignOnCustomerLoginFormActionGroup" stepKey="clickSignInAccountButton" />
         <see stepKey="seeFirstName" userInput="$$customer.firstname$$" selector="{{StorefrontCustomerDashboardAccountInformationSection.ContactInformation}}" />
         <see stepKey="seeLastName" userInput="$$customer.lastname$$" selector="{{StorefrontCustomerDashboardAccountInformationSection.ContactInformation}}" />
         <see stepKey="seeEmail" userInput="$$customer.email$$" selector="{{StorefrontCustomerDashboardAccountInformationSection.ContactInformation}}" />
diff --git a/app/code/Magento/Wishlist/Test/Mftf/Test/ConfigurableProductChildImageShouldBeShownOnWishListTest.xml b/app/code/Magento/Wishlist/Test/Mftf/Test/ConfigurableProductChildImageShouldBeShownOnWishListTest.xml
index 738bbc6bda35c..e3c4baf8aa813 100644
--- a/app/code/Magento/Wishlist/Test/Mftf/Test/ConfigurableProductChildImageShouldBeShownOnWishListTest.xml
+++ b/app/code/Magento/Wishlist/Test/Mftf/Test/ConfigurableProductChildImageShouldBeShownOnWishListTest.xml
@@ -56,11 +56,11 @@
         <actionGroup ref="SaveProductFormActionGroup" stepKey="saveSimpleProduct"/>
 
          <!--Sign in as customer -->
-        <amOnPage url="{{StorefrontCustomerSignInPage.url}}" stepKey="amOnSignInPage"/>
-        <fillField userInput="$$customer.email$$" selector="{{StorefrontCustomerSignInFormSection.emailField}}" stepKey="fillEmail"/>
-        <fillField userInput="$$customer.password$$" selector="{{StorefrontCustomerSignInFormSection.passwordField}}" stepKey="fillPassword"/>
-        <waitForElementVisible selector="{{StorefrontCustomerSignInFormSection.signInAccountButton}}" stepKey="waitForButton"/>
-        <click selector="{{StorefrontCustomerSignInFormSection.signInAccountButton}}" stepKey="clickSignInAccountButton"/>
+        <actionGroup ref="StorefrontOpenCustomerLoginPageActionGroup" stepKey="goToSignInPage"/>
+        <actionGroup ref="StorefrontFillCustomerLoginFormActionGroup" stepKey="fillLoginFormWithCorrectCredentials">
+            <argument name="customer" value="$$customer$$"/>
+        </actionGroup>
+        <actionGroup ref="StorefrontClickSignOnCustomerLoginFormActionGroup" stepKey="clickSignInAccountButton" />
         <see userInput="$$customer.firstname$$" selector="{{StorefrontCustomerDashboardAccountInformationSection.ContactInformation}}" stepKey="seeFirstName"/>
         <see userInput="$$customer.lastname$$" selector="{{StorefrontCustomerDashboardAccountInformationSection.ContactInformation}}" stepKey="seeLastName"/>
         <see userInput="$$customer.email$$" selector="{{StorefrontCustomerDashboardAccountInformationSection.ContactInformation}}" stepKey="seeEmail"/>
diff --git a/app/code/Magento/Wishlist/Test/Mftf/Test/StorefrontDeletePersistedWishlistTest.xml b/app/code/Magento/Wishlist/Test/Mftf/Test/StorefrontDeletePersistedWishlistTest.xml
index 0ead68a6b9144..3d8b5cc18bb98 100644
--- a/app/code/Magento/Wishlist/Test/Mftf/Test/StorefrontDeletePersistedWishlistTest.xml
+++ b/app/code/Magento/Wishlist/Test/Mftf/Test/StorefrontDeletePersistedWishlistTest.xml
@@ -34,13 +34,11 @@
             <deleteData stepKey="deleteCustomer" createDataKey="customer"/>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="adminLogout"/>
         </after>
-
-        <amOnPage stepKey="amOnSignInPage"  url="{{StorefrontCustomerSignInPage.url}}"/>
-        <waitForPageLoad stepKey="waitForLoginPage"/>
-        <fillField  stepKey="fillEmail" userInput="$$customer.email$$" selector="{{StorefrontCustomerSignInFormSection.emailField}}"/>
-        <fillField  stepKey="fillPassword" userInput="$$customer.password$$" selector="{{StorefrontCustomerSignInFormSection.passwordField}}"/>
-        <waitForElementVisible stepKey="waitForButton" selector="{{StorefrontCustomerSignInFormSection.signInAccountButton}}"/>
-        <click stepKey="clickSignInAccountButton" selector="{{StorefrontCustomerSignInFormSection.signInAccountButton}}"/>
+        <actionGroup ref="StorefrontOpenCustomerLoginPageActionGroup" stepKey="goToSignInPage"/>
+        <actionGroup ref="StorefrontFillCustomerLoginFormActionGroup" stepKey="fillLoginFormWithCorrectCredentials">
+            <argument name="customer" value="$$customer$$"/>
+        </actionGroup>
+        <actionGroup ref="StorefrontClickSignOnCustomerLoginFormActionGroup" stepKey="clickSignInAccountButton" />
         <see stepKey="seeFirstName" userInput="$$customer.firstname$$" selector="{{StorefrontCustomerDashboardAccountInformationSection.ContactInformation}}" />
         <see stepKey="seeLastName" userInput="$$customer.lastname$$" selector="{{StorefrontCustomerDashboardAccountInformationSection.ContactInformation}}" />
         <see stepKey="seeEmail" userInput="$$customer.email$$" selector="{{StorefrontCustomerDashboardAccountInformationSection.ContactInformation}}" />

From d47f683d0d4cb1c8546bd197210db8bdb4070ec9 Mon Sep 17 00:00:00 2001
From: Nikita Shcherbatykh <nikita.shcherbatykh@transoftgroup.com>
Date: Thu, 7 May 2020 14:34:07 +0300
Subject: [PATCH 080/120] MC-33554: B2B - Customer Group Resets to Default
 (General) whenever the customer saves their account

---
 .../Customer/Model/CustomerExtractor.php      |   8 +-
 .../Test/Unit/Model/CustomerExtractorTest.php | 124 +++++++++++++-----
 2 files changed, 97 insertions(+), 35 deletions(-)

diff --git a/app/code/Magento/Customer/Model/CustomerExtractor.php b/app/code/Magento/Customer/Model/CustomerExtractor.php
index 5d6f3245a0439..b9739ce0424a1 100644
--- a/app/code/Magento/Customer/Model/CustomerExtractor.php
+++ b/app/code/Magento/Customer/Model/CustomerExtractor.php
@@ -93,13 +93,15 @@ public function extract(
             $customerData,
             \Magento\Customer\Api\Data\CustomerInterface::class
         );
-        
+
         $store = $this->storeManager->getStore();
         $storeId = $store->getId();
-        
+
         if ($isGroupIdEmpty) {
+            $groupId = isset($customerData['group_id']) ? $customerData['group_id']
+                : $this->customerGroupManagement->getDefaultGroup($storeId)->getId();
             $customerDataObject->setGroupId(
-                $this->customerGroupManagement->getDefaultGroup($storeId)->getId()
+                $groupId
             );
         }
 
diff --git a/app/code/Magento/Customer/Test/Unit/Model/CustomerExtractorTest.php b/app/code/Magento/Customer/Test/Unit/Model/CustomerExtractorTest.php
index 6fd5c76da81c0..751f7d43eab76 100644
--- a/app/code/Magento/Customer/Test/Unit/Model/CustomerExtractorTest.php
+++ b/app/code/Magento/Customer/Test/Unit/Model/CustomerExtractorTest.php
@@ -6,7 +6,17 @@
 
 namespace Magento\Customer\Test\Unit\Model;
 
+use Magento\Customer\Api\Data\CustomerInterface;
+use Magento\Customer\Api\Data\CustomerInterfaceFactory;
+use Magento\Customer\Api\Data\GroupInterface;
+use Magento\Customer\Api\GroupManagementInterface;
 use Magento\Customer\Model\CustomerExtractor;
+use Magento\Customer\Model\Metadata\Form;
+use Magento\Customer\Model\Metadata\FormFactory;
+use Magento\Framework\Api\DataObjectHelper;
+use Magento\Framework\App\RequestInterface;
+use Magento\Store\Api\Data\StoreInterface;
+use Magento\Store\Model\StoreManagerInterface;
 
 /**
  * Unit test CustomerExtractorTest
@@ -16,40 +26,40 @@ class CustomerExtractorTest extends \PHPUnit\Framework\TestCase
     /** @var CustomerExtractor */
     protected $customerExtractor;
 
-    /** @var \Magento\Customer\Model\Metadata\FormFactory|\PHPUnit_Framework_MockObject_MockObject */
+    /** @var FormFactory|\PHPUnit_Framework_MockObject_MockObject */
     protected $formFactory;
 
-    /** @var \Magento\Customer\Api\Data\CustomerInterfaceFactory|\PHPUnit_Framework_MockObject_MockObject */
+    /** @var CustomerInterfaceFactory|\PHPUnit_Framework_MockObject_MockObject */
     protected $customerFactory;
 
-    /** @var \Magento\Store\Model\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject */
+    /** @var StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject */
     protected $storeManager;
 
-    /** @var \Magento\Customer\Api\GroupManagementInterface|\PHPUnit_Framework_MockObject_MockObject */
+    /** @var GroupManagementInterface|\PHPUnit_Framework_MockObject_MockObject */
     protected $customerGroupManagement;
 
-    /** @var \Magento\Framework\Api\DataObjectHelper|\PHPUnit_Framework_MockObject_MockObject */
+    /** @var DataObjectHelper|\PHPUnit_Framework_MockObject_MockObject */
     protected $dataObjectHelper;
 
-    /** @var \Magento\Framework\App\RequestInterface|\PHPUnit_Framework_MockObject_MockObject */
+    /** @var RequestInterface|\PHPUnit_Framework_MockObject_MockObject */
     protected $request;
 
-    /** @var \Magento\Customer\Model\Metadata\Form|\PHPUnit_Framework_MockObject_MockObject */
+    /** @var Form|\PHPUnit_Framework_MockObject_MockObject */
     protected $customerForm;
 
-    /** @var \Magento\Customer\Api\Data\CustomerInterface|\PHPUnit_Framework_MockObject_MockObject */
+    /** @var CustomerInterface|\PHPUnit_Framework_MockObject_MockObject */
     protected $customerData;
 
-    /** @var \Magento\Store\Api\Data\StoreInterface|\PHPUnit_Framework_MockObject_MockObject */
+    /** @var StoreInterface|\PHPUnit_Framework_MockObject_MockObject */
     protected $store;
 
-    /** @var \Magento\Customer\Api\Data\GroupInterface|\PHPUnit_Framework_MockObject_MockObject */
+    /** @var GroupInterface|\PHPUnit_Framework_MockObject_MockObject */
     protected $customerGroup;
 
     protected function setUp()
     {
         $this->formFactory = $this->getMockForAbstractClass(
-            \Magento\Customer\Model\Metadata\FormFactory::class,
+            FormFactory::class,
             [],
             '',
             false,
@@ -58,7 +68,7 @@ protected function setUp()
             ['create']
         );
         $this->customerFactory = $this->getMockForAbstractClass(
-            \Magento\Customer\Api\Data\CustomerInterfaceFactory::class,
+            CustomerInterfaceFactory::class,
             [],
             '',
             false,
@@ -67,34 +77,34 @@ protected function setUp()
             ['create']
         );
         $this->storeManager = $this->getMockForAbstractClass(
-            \Magento\Store\Model\StoreManagerInterface::class,
+            StoreManagerInterface::class,
             [],
             '',
             false
         );
         $this->customerGroupManagement = $this->getMockForAbstractClass(
-            \Magento\Customer\Api\GroupManagementInterface::class,
+            GroupManagementInterface::class,
             [],
             '',
             false
         );
-        $this->dataObjectHelper = $this->createMock(\Magento\Framework\Api\DataObjectHelper::class);
-        $this->request = $this->getMockForAbstractClass(\Magento\Framework\App\RequestInterface::class, [], '', false);
-        $this->customerForm = $this->createMock(\Magento\Customer\Model\Metadata\Form::class);
+        $this->dataObjectHelper = $this->createMock(DataObjectHelper::class);
+        $this->request = $this->getMockForAbstractClass(RequestInterface::class, [], '', false);
+        $this->customerForm = $this->createMock(Form::class);
         $this->customerData = $this->getMockForAbstractClass(
-            \Magento\Customer\Api\Data\CustomerInterface::class,
+            CustomerInterface::class,
             [],
             '',
             false
         );
         $this->store = $this->getMockForAbstractClass(
-            \Magento\Store\Api\Data\StoreInterface::class,
+            StoreInterface::class,
             [],
             '',
             false
         );
         $this->customerGroup = $this->getMockForAbstractClass(
-            \Magento\Customer\Api\Data\GroupInterface::class,
+            GroupInterface::class,
             [],
             '',
             false
@@ -108,14 +118,27 @@ protected function setUp()
         );
     }
 
-    public function testExtract()
+    /**
+     * @param int $storeId
+     * @param int $websiteId
+     * @param array $customerData
+     * @dataProvider getDataProvider
+     * @return void
+     */
+    public function testExtract(int $storeId, int $websiteId, array $customerData)
     {
-        $customerData = [
-            'firstname' => 'firstname',
-            'lastname' => 'firstname',
-            'email' => 'email.example.com',
-        ];
+        $this->initializeExpectation($storeId, $websiteId, $customerData);
 
+        $this->assertSame($this->customerData, $this->customerExtractor->extract('form-code', $this->request));
+    }
+
+    /**
+     * @param int $storeId
+     * @param int $websiteId
+     * @param array $customerData
+     */
+    private function initializeExpectation(int $storeId, int $websiteId, array $customerData): void
+    {
         $this->formFactory->expects($this->once())
             ->method('create')
             ->with('customer', 'form-code')
@@ -136,24 +159,61 @@ public function testExtract()
             ->willReturn($this->customerData);
         $this->dataObjectHelper->expects($this->once())
             ->method('populateWithArray')
-            ->with($this->customerData, $customerData, \Magento\Customer\Api\Data\CustomerInterface::class)
+            ->with($this->customerData, $customerData, CustomerInterface::class)
             ->willReturn($this->customerData);
         $this->storeManager->expects($this->once())
             ->method('getStore')
             ->willReturn($this->store);
         $this->store->expects($this->once())
             ->method('getId')
-            ->willReturn(1);
+            ->willReturn($storeId);
         $this->store->expects($this->once())
             ->method('getWebsiteId')
-            ->willReturn(1);
+            ->willReturn($websiteId);
         $this->customerData->expects($this->once())
             ->method('setWebsiteId')
-            ->with(1);
+            ->with($websiteId);
         $this->customerData->expects($this->once())
             ->method('setStoreId')
-            ->with(1);
+            ->with($storeId);
+    }
 
-        $this->assertSame($this->customerData, $this->customerExtractor->extract('form-code', $this->request));
+    /**
+     * @return array
+     */
+    public function getDataProvider()
+    {
+        return [
+            'extract data when group id is null' => [
+                1,
+                1,
+                [
+                    'firstname' => 'firstname-1',
+                    'lastname' => 'firstname-1',
+                    'email' => 'email-1.example.com',
+                    'group_id' => null
+                ]
+            ],
+            'extract data when group id is not null and default' => [
+                1,
+                2,
+                [
+                    'firstname' => 'firstname-2',
+                    'lastname' => 'firstname-3',
+                    'email' => 'email-2.example.com',
+                    'group_id' => 1
+                ]
+            ],
+            'extract data when group id is different from default' => [
+                1,
+                1,
+                [
+                    'firstname' => 'firstname-3',
+                    'lastname' => 'firstname-3',
+                    'email' => 'email-3.example.com',
+                    'group_id' => 2
+                ]
+            ],
+        ];
     }
 }

From a69787765290f73428a36b158edb63504875f438 Mon Sep 17 00:00:00 2001
From: "rostyslav.hymon" <rostyslav.hymon@transoftgroup.com>
Date: Thu, 7 May 2020 14:48:42 +0300
Subject: [PATCH 081/120] MC-33487: Catalog Rule fatal error - on certain
 combinations of conditions

---
 .../ConditionsToSearchCriteriaMapper.php      | 49 +++++++++++++------
 .../ConditionsToCollectionApplierTest.php     | 46 +++++++++++++++++
 2 files changed, 81 insertions(+), 14 deletions(-)

diff --git a/app/code/Magento/CatalogRule/Model/Rule/Condition/ConditionsToSearchCriteriaMapper.php b/app/code/Magento/CatalogRule/Model/Rule/Condition/ConditionsToSearchCriteriaMapper.php
index fabe504fbe31c..662a2fd6b38fc 100644
--- a/app/code/Magento/CatalogRule/Model/Rule/Condition/ConditionsToSearchCriteriaMapper.php
+++ b/app/code/Magento/CatalogRule/Model/Rule/Condition/ConditionsToSearchCriteriaMapper.php
@@ -7,13 +7,16 @@
 
 namespace Magento\CatalogRule\Model\Rule\Condition;
 
-use Magento\Framework\Exception\InputException;
-use Magento\Rule\Model\Condition\ConditionInterface;
 use Magento\CatalogRule\Model\Rule\Condition\Combine as CombinedCondition;
 use Magento\CatalogRule\Model\Rule\Condition\Product as SimpleCondition;
 use Magento\Framework\Api\CombinedFilterGroup as FilterGroup;
+use Magento\Framework\Api\CombinedFilterGroupFactory;
 use Magento\Framework\Api\Filter;
+use Magento\Framework\Api\FilterFactory;
 use Magento\Framework\Api\SearchCriteria;
+use Magento\Framework\Api\SearchCriteriaBuilderFactory;
+use Magento\Framework\Exception\InputException;
+use Magento\Rule\Model\Condition\ConditionInterface;
 
 /**
  * Maps catalog price rule conditions to search criteria
@@ -21,29 +24,29 @@
 class ConditionsToSearchCriteriaMapper
 {
     /**
-     * @var \Magento\Framework\Api\SearchCriteriaBuilderFactory
+     * @var SearchCriteriaBuilderFactory
      */
     private $searchCriteriaBuilderFactory;
 
     /**
-     * @var \Magento\Framework\Api\CombinedFilterGroupFactory
+     * @var CombinedFilterGroupFactory
      */
     private $combinedFilterGroupFactory;
 
     /**
-     * @var \Magento\Framework\Api\FilterFactory
+     * @var FilterFactory
      */
     private $filterFactory;
 
     /**
-     * @param \Magento\Framework\Api\SearchCriteriaBuilderFactory $searchCriteriaBuilderFactory
-     * @param \Magento\Framework\Api\CombinedFilterGroupFactory $combinedFilterGroupFactory
-     * @param \Magento\Framework\Api\FilterFactory $filterFactory
+     * @param SearchCriteriaBuilderFactory $searchCriteriaBuilderFactory
+     * @param CombinedFilterGroupFactory $combinedFilterGroupFactory
+     * @param FilterFactory $filterFactory
      */
     public function __construct(
-        \Magento\Framework\Api\SearchCriteriaBuilderFactory $searchCriteriaBuilderFactory,
-        \Magento\Framework\Api\CombinedFilterGroupFactory $combinedFilterGroupFactory,
-        \Magento\Framework\Api\FilterFactory $filterFactory
+        SearchCriteriaBuilderFactory $searchCriteriaBuilderFactory,
+        CombinedFilterGroupFactory $combinedFilterGroupFactory,
+        FilterFactory $filterFactory
     ) {
         $this->searchCriteriaBuilderFactory = $searchCriteriaBuilderFactory;
         $this->combinedFilterGroupFactory = $combinedFilterGroupFactory;
@@ -74,7 +77,7 @@ public function mapConditionsToSearchCriteria(CombinedCondition $conditions): Se
      * Convert condition to filter group
      *
      * @param ConditionInterface $condition
-     * @return null|\Magento\Framework\Api\CombinedFilterGroup|\Magento\Framework\Api\Filter
+     * @return null|FilterGroup|Filter
      * @throws InputException
      */
     private function mapConditionToFilterGroup(ConditionInterface $condition)
@@ -94,7 +97,7 @@ private function mapConditionToFilterGroup(ConditionInterface $condition)
      * Convert combined condition to filter group
      *
      * @param Combine $combinedCondition
-     * @return null|\Magento\Framework\Api\CombinedFilterGroup
+     * @return null|FilterGroup
      * @throws InputException
      */
     private function mapCombinedConditionToFilterGroup(CombinedCondition $combinedCondition)
@@ -111,7 +114,7 @@ private function mapCombinedConditionToFilterGroup(CombinedCondition $combinedCo
             // This required to solve cases when condition is configured like:
             // "If ALL/ANY of these conditions are FALSE" - we need to reverse SQL operator for this "FALSE"
             if ((bool)$combinedCondition->getValue() === false) {
-                $this->reverseSqlOperatorInFilter($filter);
+                $this->reverseSqlOperatorInFilterRecursively($filter);
             }
 
             $filters[] = $filter;
@@ -183,6 +186,24 @@ private function getGlueForArrayValues(string $operator): string
         return 'any';
     }
 
+    /**
+     * Recursively reverse sql conditions to their corresponding negative analog for the entire FilterGroup
+     *
+     * @param Filter|FilterGroup $filter
+     * @return void
+     * @throws InputException
+     */
+    private function reverseSqlOperatorInFilterRecursively($filter): void
+    {
+        if ($filter instanceof FilterGroup) {
+            foreach ($filter->getFilters() as &$currentFilter) {
+                $this->reverseSqlOperatorInFilterRecursively($currentFilter);
+            }
+        } else {
+            $this->reverseSqlOperatorInFilter($filter);
+        }
+    }
+
     /**
      * Reverse sql conditions to their corresponding negative analog
      *
diff --git a/dev/tests/integration/testsuite/Magento/CatalogRule/Model/ResourceModel/Product/ConditionsToCollectionApplierTest.php b/dev/tests/integration/testsuite/Magento/CatalogRule/Model/ResourceModel/Product/ConditionsToCollectionApplierTest.php
index 78fa255897dbc..2652f9633ea11 100644
--- a/dev/tests/integration/testsuite/Magento/CatalogRule/Model/ResourceModel/Product/ConditionsToCollectionApplierTest.php
+++ b/dev/tests/integration/testsuite/Magento/CatalogRule/Model/ResourceModel/Product/ConditionsToCollectionApplierTest.php
@@ -414,6 +414,19 @@ private function conditionProvider()
                     'simple-product-12'
                 ]
             ],
+
+            // test filter for case "If ALL/ANY of these conditions are FALSE" with multiple levels
+            'variation 22' => [
+                'condition' => $this->getConditionsForVariation22(),
+                'expected-sku' => [
+                    'simple-product-1',
+                    'simple-product-2',
+                    'simple-product-3',
+                    'simple-product-4',
+                    'simple-product-7',
+                    'simple-product-8'
+                ]
+            ],
         ];
     }
 
@@ -1006,6 +1019,39 @@ private function getConditionsForVariation21()
         return $this->getCombineConditionFromArray($conditions);
     }
 
+    private function getConditionsForVariation22()
+    {
+        $category1Name = 'Category 1';
+
+        $category1Id = $this->categoryCollectionFactory
+            ->create()
+            ->addAttributeToFilter('name', $category1Name)
+            ->getAllIds();
+
+        $conditions = [
+            'type' => \Magento\CatalogRule\Model\Rule\Condition\Combine::class,
+            'aggregator' => 'all',
+            'value' => 0,
+            'conditions' => [
+                [
+                    'type' => \Magento\CatalogRule\Model\Rule\Condition\Combine::class,
+                    'aggregator' => 'all',
+                    'value' => 1,
+                    'conditions' => [
+                        [
+                            'type' => \Magento\CatalogRule\Model\Rule\Condition\Product::class,
+                            'operator' => '==',
+                            'value' => implode(',', $category1Id),
+                            'attribute' => 'category_ids'
+                        ]
+                    ]
+                ]
+            ]
+        ];
+
+        return $this->getCombineConditionFromArray($conditions);
+    }
+
     private function getCombineConditionFromArray(array $data)
     {
         $combinedCondition = $this->combinedConditionFactory->create();

From 64dca9cf2a8698c01f3844ce3bbd09ec08c96679 Mon Sep 17 00:00:00 2001
From: Oleg Aleksin <olega@ven.com>
Date: Fri, 8 May 2020 09:09:35 +0300
Subject: [PATCH 082/120] Invalidate product index after change product
 position in the category

---
 app/code/Magento/Catalog/Model/ResourceModel/Category.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Category.php b/app/code/Magento/Catalog/Model/ResourceModel/Category.php
index c4980c917d069..4888719a29845 100644
--- a/app/code/Magento/Catalog/Model/ResourceModel/Category.php
+++ b/app/code/Magento/Catalog/Model/ResourceModel/Category.php
@@ -469,10 +469,6 @@ protected function _saveCategoryProducts($category)
 
         if (!empty($insert) || !empty($delete)) {
             $productIds = array_unique(array_merge(array_keys($insert), array_keys($delete)));
-            $this->_eventManager->dispatch(
-                'catalog_category_change_products',
-                ['category' => $category, 'product_ids' => $productIds]
-            );
 
             $category->setChangedProductIds($productIds);
         }
@@ -484,6 +480,10 @@ protected function _saveCategoryProducts($category)
              * Setting affected products to category for third party engine index refresh
              */
             $productIds = array_keys($insert + $delete + $update);
+            $this->_eventManager->dispatch(
+                'catalog_category_change_products',
+                ['category' => $category, 'product_ids' => $productIds]
+            );
             $category->setAffectedProductIds($productIds);
         }
         return $this;

From c9bd251082510bc4f56361b42e29164b3d6b8e90 Mon Sep 17 00:00:00 2001
From: "rostyslav.hymon" <rostyslav.hymon@transoftgroup.com>
Date: Fri, 8 May 2020 09:34:37 +0300
Subject: [PATCH 083/120] MC-33879: Paypal checkout Shipping method not
 updating correctly

---
 .../Paypal/Helper/ShippingMethodUpdater.php   |  8 +-
 .../Helper/ShippingMethodUpdaterTest.php      | 58 ++++++++----
 .../Helper/ShippingMethodUpdaterTest.php      | 89 +++++++++++++++++++
 3 files changed, 137 insertions(+), 18 deletions(-)
 create mode 100644 dev/tests/integration/testsuite/Magento/Braintree/Model/Paypal/Helper/ShippingMethodUpdaterTest.php

diff --git a/app/code/Magento/Braintree/Model/Paypal/Helper/ShippingMethodUpdater.php b/app/code/Magento/Braintree/Model/Paypal/Helper/ShippingMethodUpdater.php
index 2ad10075291ec..06e75359c0d63 100644
--- a/app/code/Magento/Braintree/Model/Paypal/Helper/ShippingMethodUpdater.php
+++ b/app/code/Magento/Braintree/Model/Paypal/Helper/ShippingMethodUpdater.php
@@ -10,7 +10,7 @@
 use Magento\Quote\Model\Quote;
 
 /**
- * Class ShippingMethodUpdater
+ * Class for updating shipping method in the quote.
  */
 class ShippingMethodUpdater extends AbstractHelper
 {
@@ -58,6 +58,12 @@ public function execute($shippingMethod, Quote $quote)
                 $this->disabledQuoteAddressValidation($quote);
 
                 $shippingAddress->setShippingMethod($shippingMethod);
+                $quoteExtensionAttributes = $quote->getExtensionAttributes();
+                if ($quoteExtensionAttributes && $quoteExtensionAttributes->getShippingAssignments()) {
+                    $quoteExtensionAttributes->getShippingAssignments()[0]
+                        ->getShipping()
+                        ->setMethod($shippingMethod);
+                }
                 $shippingAddress->setCollectShippingRates(true);
 
                 $quote->collectTotals();
diff --git a/app/code/Magento/Braintree/Test/Unit/Model/Paypal/Helper/ShippingMethodUpdaterTest.php b/app/code/Magento/Braintree/Test/Unit/Model/Paypal/Helper/ShippingMethodUpdaterTest.php
index c850a34cbdb95..028f63d144e8d 100644
--- a/app/code/Magento/Braintree/Test/Unit/Model/Paypal/Helper/ShippingMethodUpdaterTest.php
+++ b/app/code/Magento/Braintree/Test/Unit/Model/Paypal/Helper/ShippingMethodUpdaterTest.php
@@ -3,6 +3,8 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Braintree\Test\Unit\Model\Paypal\Helper;
 
 use Magento\Quote\Model\Quote;
@@ -10,38 +12,46 @@
 use Magento\Quote\Api\CartRepositoryInterface;
 use Magento\Braintree\Gateway\Config\PayPal\Config;
 use Magento\Braintree\Model\Paypal\Helper\ShippingMethodUpdater;
+use PHPUnit\Framework\MockObject\MockObject;
+use PHPUnit\Framework\TestCase;
 
 /**
- * Class ShippingMethodUpdaterTest
- *
- * @see \Magento\Braintree\Model\Paypal\Helper\ShippingMethodUpdater
+ * Test shipping method updater
  */
-class ShippingMethodUpdaterTest extends \PHPUnit\Framework\TestCase
+class ShippingMethodUpdaterTest extends TestCase
 {
     const TEST_SHIPPING_METHOD = 'test-shipping-method';
 
     const TEST_EMAIL = 'test@test.loc';
 
     /**
-     * @var Config|\PHPUnit_Framework_MockObject_MockObject
+     * @var Config|MockObject
      */
     private $configMock;
 
     /**
-     * @var CartRepositoryInterface|\PHPUnit_Framework_MockObject_MockObject
+     * @var CartRepositoryInterface|MockObject
      */
     private $quoteRepositoryMock;
 
     /**
-     * @var Address|\PHPUnit_Framework_MockObject_MockObject
+     * @var Address|MockObject
      */
     private $shippingAddressMock;
 
+    /**
+     * @var Address|MockObject
+     */
+    private $billingAddressMock;
+
     /**
      * @var ShippingMethodUpdater
      */
     private $shippingMethodUpdater;
 
+    /**
+     * @inheritdoc
+     */
     protected function setUp()
     {
         $this->configMock = $this->getMockBuilder(Config::class)
@@ -68,17 +78,22 @@ protected function setUp()
     }
 
     /**
+     * Test execute exception
+     *
      * @expectedException \InvalidArgumentException
      * @expectedExceptionMessage The "shippingMethod" field does not exists.
      */
-    public function testExecuteException()
+    public function testExecuteException(): void
     {
         $quoteMock = $this->getQuoteMock();
 
         $this->shippingMethodUpdater->execute('', $quoteMock);
     }
 
-    public function testExecute()
+    /**
+     * Test execute
+     */
+    public function testExecute(): void
     {
         $quoteMock = $this->getQuoteMock();
 
@@ -114,9 +129,13 @@ public function testExecute()
     }
 
     /**
-     * @param \PHPUnit_Framework_MockObject_MockObject $quoteMock
+     * Disable quote address validation
+     *
+     * @param MockObject $quoteMock
+     *
+     * @return void
      */
-    private function disabledQuoteAddressValidationStep(\PHPUnit_Framework_MockObject_MockObject $quoteMock)
+    private function disabledQuoteAddressValidationStep(MockObject $quoteMock): void
     {
         $billingAddressMock = $this->getBillingAddressMock($quoteMock);
 
@@ -139,10 +158,12 @@ private function disabledQuoteAddressValidationStep(\PHPUnit_Framework_MockObjec
     }
 
     /**
-     * @param \PHPUnit_Framework_MockObject_MockObject $quoteMock
-     * @return Address|\PHPUnit_Framework_MockObject_MockObject
+     * Get billing address mock object
+     *
+     * @param MockObject $quoteMock
+     * @return Address|MockObject
      */
-    private function getBillingAddressMock(\PHPUnit_Framework_MockObject_MockObject $quoteMock)
+    private function getBillingAddressMock(MockObject $quoteMock): MockObject
     {
         if (!isset($this->billingAddressMock)) {
             $this->billingAddressMock = $this->getMockBuilder(Address::class)
@@ -159,9 +180,11 @@ private function getBillingAddressMock(\PHPUnit_Framework_MockObject_MockObject
     }
 
     /**
-     * @return Quote|\PHPUnit_Framework_MockObject_MockObject
+     * Get quote mock object
+     *
+     * @return Quote|MockObject
      */
-    private function getQuoteMock()
+    private function getQuoteMock(): MockObject
     {
         return $this->getMockBuilder(Quote::class)
             ->setMethods(
@@ -169,7 +192,8 @@ private function getQuoteMock()
                     'collectTotals',
                     'getBillingAddress',
                     'getShippingAddress',
-                    'getIsVirtual'
+                    'getIsVirtual',
+                    'getExtensionAttributes'
                 ]
             )->disableOriginalConstructor()
             ->getMock();
diff --git a/dev/tests/integration/testsuite/Magento/Braintree/Model/Paypal/Helper/ShippingMethodUpdaterTest.php b/dev/tests/integration/testsuite/Magento/Braintree/Model/Paypal/Helper/ShippingMethodUpdaterTest.php
new file mode 100644
index 0000000000000..e1f45df26ce1e
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Braintree/Model/Paypal/Helper/ShippingMethodUpdaterTest.php
@@ -0,0 +1,89 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Braintree\Model\Paypal\Helper;
+
+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 PHPUnit\Framework\TestCase;
+
+/**
+ * Test shipping method updater
+ */
+class ShippingMethodUpdaterTest extends TestCase
+{
+    /**
+     * @var ShippingMethodUpdater
+     */
+    private $shippingMethodUpdater;
+
+    /**
+     * @var ObjectManagerInterface
+     */
+    private $objectManager;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        $this->objectManager = Bootstrap::getObjectManager();
+        $this->shippingMethodUpdater = $this->objectManager->get(ShippingMethodUpdater::class);
+    }
+
+    /**
+     * Tests that shipping method is actually updated in quote.
+     *
+     * @return void
+     * @magentoAppArea frontend
+     * @magentoConfigFixture default_store carriers/flatrate/active 1
+     * @magentoConfigFixture default_store carriers/freeshipping/active 1
+     * @magentoDataFixture Magento/Braintree/Fixtures/paypal_quote.php
+     */
+    public function testExecute(): void
+    {
+        $reservedOrderId = 'test01';
+        /** @var Quote $quote */
+        $quote = $this->getQuote($reservedOrderId);
+
+        $this->assertEquals(
+            'flatrate_flatrate',
+            $quote->getShippingAddress()->getShippingMethod()
+        );
+
+        $this->shippingMethodUpdater->execute('freeshipping_freeshipping', $quote);
+
+        $this->assertEquals(
+            'freeshipping_freeshipping',
+            $quote->getShippingAddress()->getShippingMethod()
+        );
+    }
+
+    /**
+     * Gets quote by reserved order ID.
+     *
+     * @param string $reservedOrderId
+     * @return CartInterface
+     */
+    private function getQuote(string $reservedOrderId): CartInterface
+    {
+        $searchCriteria = $this->objectManager->get(SearchCriteriaBuilder::class)
+            ->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 c7efd91d16c46de0657f01b51b9af4faaa806050 Mon Sep 17 00:00:00 2001
From: Ihor Sviziev <ihor-sviziev@users.noreply.github.com>
Date: Fri, 8 May 2020 10:55:22 +0300
Subject: [PATCH 084/120] magento/magento2#28150 Invalidate product index after
 change product position in the category

Fix static tests
---
 app/code/Magento/Catalog/Model/ResourceModel/Category.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Category.php b/app/code/Magento/Catalog/Model/ResourceModel/Category.php
index 4888719a29845..298ca059c572e 100644
--- a/app/code/Magento/Catalog/Model/ResourceModel/Category.php
+++ b/app/code/Magento/Catalog/Model/ResourceModel/Category.php
@@ -1078,7 +1078,6 @@ public function countVisible()
      */
     public function load($object, $entityId, $attributes = [])
     {
-        $this->_attributes = [];
         $select = $this->_getLoadRowSelect($object, $entityId);
         $row = $this->getConnection()->fetchRow($select);
 

From 03f65cc2a8329931504a1d1b68264a71cd689f58 Mon Sep 17 00:00:00 2001
From: Vasya Tsviklinskyi <tsviklinskyi@gmail.com>
Date: Fri, 8 May 2020 11:25:29 +0300
Subject: [PATCH 085/120] MC-33314: [Magento On-Premise] Advanced Reporting and
 Segment Reports are not able to access

---
 .../Controller/Adminhtml/Reports/Show.php     |  2 +-
 .../Controller/Adminhtml/Reports/ShowTest.php | 35 +++++++++++++++++++
 2 files changed, 36 insertions(+), 1 deletion(-)
 create mode 100644 dev/tests/integration/testsuite/Magento/Analytics/Controller/Adminhtml/Reports/ShowTest.php

diff --git a/app/code/Magento/Analytics/Controller/Adminhtml/Reports/Show.php b/app/code/Magento/Analytics/Controller/Adminhtml/Reports/Show.php
index 9068654fa944f..5614090006f8a 100644
--- a/app/code/Magento/Analytics/Controller/Adminhtml/Reports/Show.php
+++ b/app/code/Magento/Analytics/Controller/Adminhtml/Reports/Show.php
@@ -27,7 +27,7 @@ class Show extends Action implements HttpGetActionInterface
     /**
      * @inheritdoc
      */
-    const ADMIN_RESOURCE = 'Magento_Analytics::analytics_settings';
+    const ADMIN_RESOURCE = 'Magento_Analytics::advanced_reporting';
 
     /**
      * @param Context $context
diff --git a/dev/tests/integration/testsuite/Magento/Analytics/Controller/Adminhtml/Reports/ShowTest.php b/dev/tests/integration/testsuite/Magento/Analytics/Controller/Adminhtml/Reports/ShowTest.php
new file mode 100644
index 0000000000000..f492e2cd09570
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Analytics/Controller/Adminhtml/Reports/ShowTest.php
@@ -0,0 +1,35 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Analytics\Controller\Adminhtml\Reports;
+
+use Magento\TestFramework\TestCase\AbstractBackendController;
+
+/**
+ * @magentoAppArea adminhtml
+ */
+class ShowTest extends AbstractBackendController
+{
+    private const REPORT_HOST = 'advancedreporting.rjmetrics.com';
+    /**
+     * @inheritDoc
+     */
+    protected $resource = 'Magento_Analytics::advanced_reporting';
+    /**
+     * @inheritDoc
+     */
+    protected $uri = 'backend/analytics/reports/show';
+    /**
+     * @inheritDoc
+     */
+    public function testAclHasAccess()
+    {
+        parent::testAclHasAccess();
+        $this->assertSame(302, $this->getResponse()->getHttpResponseCode());
+        $this->assertSame(self::REPORT_HOST, $this->getResponse()->getHeader('location')->uri()->getHost());
+    }
+}

From e6c960109cb497280bec1ede0ae0464efa92fad7 Mon Sep 17 00:00:00 2001
From: "vadim.malesh" <engcom-vendorworker-charlie@adobe.com>
Date: Fri, 8 May 2020 11:39:16 +0300
Subject: [PATCH 086/120] marked method as deprecated

---
 .../Magento/Framework/Model/ResourceModel/AbstractResource.php   | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/internal/Magento/Framework/Model/ResourceModel/AbstractResource.php b/lib/internal/Magento/Framework/Model/ResourceModel/AbstractResource.php
index 51a59df3383af..b55b33ddfa54b 100644
--- a/lib/internal/Magento/Framework/Model/ResourceModel/AbstractResource.php
+++ b/lib/internal/Magento/Framework/Model/ResourceModel/AbstractResource.php
@@ -82,6 +82,7 @@ public function addCommitCallback($callback)
     /**
      * Commit resource transaction
      *
+     * @deprecated see \Magento\Framework\Model\ExecuteCommitCallbacks::afterCommit
      * @return $this
      * @api
      */

From f733ee3f6929cc20430d81339d694f7f3cf4fdb7 Mon Sep 17 00:00:00 2001
From: Vadim Malesh <51680850+engcom-Charlie@users.noreply.github.com>
Date: Fri, 8 May 2020 12:30:09 +0300
Subject: [PATCH 087/120] fix static

---
 .../Model/Test/Unit/ResourceModel/AbstractResourceTest.php      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/internal/Magento/Framework/Model/Test/Unit/ResourceModel/AbstractResourceTest.php b/lib/internal/Magento/Framework/Model/Test/Unit/ResourceModel/AbstractResourceTest.php
index 4f979f554d3ee..e795e3dc7d40c 100644
--- a/lib/internal/Magento/Framework/Model/Test/Unit/ResourceModel/AbstractResourceTest.php
+++ b/lib/internal/Magento/Framework/Model/Test/Unit/ResourceModel/AbstractResourceTest.php
@@ -239,7 +239,7 @@ function () use ($closureExpectation) {
      */
     public function testCommitZeroLevelCallbackException(): void
     {
-        /** @var AdapterInterface|\PHPUnit_Framework_MockObject_MockObject $connection */
+        /** @var AdapterInterface|MockObject $connection */
         $connection = $this->createMock(AdapterInterface::class);
 
         $this->model->setConnection($connection);

From a0f475b3f7a6e612f611b6d8467c573265a771df Mon Sep 17 00:00:00 2001
From: Alexander Steshuk <grp-engcom-vendorworker-Kilo@adobe.com>
Date: Fri, 8 May 2020 12:54:28 +0300
Subject: [PATCH 088/120] #28112: Fixed MFTF test.

---
 app/code/Magento/Cms/Test/Mftf/Test/AdminDeleteCmsPageTest.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/code/Magento/Cms/Test/Mftf/Test/AdminDeleteCmsPageTest.xml b/app/code/Magento/Cms/Test/Mftf/Test/AdminDeleteCmsPageTest.xml
index bf165496e8d41..6167d4b064a8c 100644
--- a/app/code/Magento/Cms/Test/Mftf/Test/AdminDeleteCmsPageTest.xml
+++ b/app/code/Magento/Cms/Test/Mftf/Test/AdminDeleteCmsPageTest.xml
@@ -25,6 +25,7 @@
             <actionGroup ref="SaveCmsPageActionGroup" stepKey="clickSaveCmsPageButton"/>
         </before>
         <after>
+            <actionGroup ref="AdminGridFilterResetActionGroup" stepKey="clearGridFilters"/>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="adminLogout"/>
         </after>
 

From b43bb73b02c632a91493b4f21587fbd5cebc1a47 Mon Sep 17 00:00:00 2001
From: Nikita Shcherbatykh <nikita.shcherbatykh@transoftgroup.com>
Date: Fri, 8 May 2020 15:05:18 +0300
Subject: [PATCH 089/120] MC-33554: B2B - Customer Group Resets to Default
 (General) whenever the customer saves their account

---
 .../Test/Unit/Model/CustomerExtractorTest.php | 21 ++++++++++---------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/app/code/Magento/Customer/Test/Unit/Model/CustomerExtractorTest.php b/app/code/Magento/Customer/Test/Unit/Model/CustomerExtractorTest.php
index 751f7d43eab76..986da6115ce9b 100644
--- a/app/code/Magento/Customer/Test/Unit/Model/CustomerExtractorTest.php
+++ b/app/code/Magento/Customer/Test/Unit/Model/CustomerExtractorTest.php
@@ -17,6 +17,7 @@
 use Magento\Framework\App\RequestInterface;
 use Magento\Store\Api\Data\StoreInterface;
 use Magento\Store\Model\StoreManagerInterface;
+use PHPUnit\Framework\MockObject\MockObject;
 
 /**
  * Unit test CustomerExtractorTest
@@ -26,34 +27,34 @@ class CustomerExtractorTest extends \PHPUnit\Framework\TestCase
     /** @var CustomerExtractor */
     protected $customerExtractor;
 
-    /** @var FormFactory|\PHPUnit_Framework_MockObject_MockObject */
+    /** @var FormFactory|MockObject */
     protected $formFactory;
 
-    /** @var CustomerInterfaceFactory|\PHPUnit_Framework_MockObject_MockObject */
+    /** @var CustomerInterfaceFactory|MockObject */
     protected $customerFactory;
 
-    /** @var StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject */
+    /** @var StoreManagerInterface|MockObject */
     protected $storeManager;
 
-    /** @var GroupManagementInterface|\PHPUnit_Framework_MockObject_MockObject */
+    /** @var GroupManagementInterface|MockObject */
     protected $customerGroupManagement;
 
-    /** @var DataObjectHelper|\PHPUnit_Framework_MockObject_MockObject */
+    /** @var DataObjectHelper|MockObject */
     protected $dataObjectHelper;
 
-    /** @var RequestInterface|\PHPUnit_Framework_MockObject_MockObject */
+    /** @var RequestInterface|MockObject */
     protected $request;
 
-    /** @var Form|\PHPUnit_Framework_MockObject_MockObject */
+    /** @var Form|MockObject */
     protected $customerForm;
 
-    /** @var CustomerInterface|\PHPUnit_Framework_MockObject_MockObject */
+    /** @var CustomerInterface|MockObject */
     protected $customerData;
 
-    /** @var StoreInterface|\PHPUnit_Framework_MockObject_MockObject */
+    /** @var StoreInterface|MockObject */
     protected $store;
 
-    /** @var GroupInterface|\PHPUnit_Framework_MockObject_MockObject */
+    /** @var GroupInterface|MockObject */
     protected $customerGroup;
 
     protected function setUp()

From d3df0ed71e85f1724eaee59b4fa154a2c24a8b37 Mon Sep 17 00:00:00 2001
From: Alexander Steshuk <grp-engcom-vendorworker-Kilo@adobe.com>
Date: Fri, 8 May 2020 15:34:11 +0300
Subject: [PATCH 090/120] Fixed MFTF.

---
 app/code/Magento/Cms/Test/Mftf/Test/AdminDeleteCmsPageTest.xml | 3 ++-
 .../Magento/Widget/Test/Mftf/Test/ProductsListWidgetTest.xml   | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/code/Magento/Cms/Test/Mftf/Test/AdminDeleteCmsPageTest.xml b/app/code/Magento/Cms/Test/Mftf/Test/AdminDeleteCmsPageTest.xml
index 6167d4b064a8c..c46410dce919e 100644
--- a/app/code/Magento/Cms/Test/Mftf/Test/AdminDeleteCmsPageTest.xml
+++ b/app/code/Magento/Cms/Test/Mftf/Test/AdminDeleteCmsPageTest.xml
@@ -21,11 +21,12 @@
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
             <actionGroup ref="AdminNavigateToPageGridActionGroup" stepKey="navigateToCmsPageGrid"/>
+            <actionGroup ref="ClearFiltersAdminDataGridActionGroup" stepKey="clearGridSearchFilters"/>
             <actionGroup ref="CreateNewPageWithBasicValues" stepKey="createNewPageWithBasicValues"/>
             <actionGroup ref="SaveCmsPageActionGroup" stepKey="clickSaveCmsPageButton"/>
         </before>
         <after>
-            <actionGroup ref="AdminGridFilterResetActionGroup" stepKey="clearGridFilters"/>
+            <actionGroup ref="ClearFiltersAdminDataGridActionGroup" stepKey="clearGridFilters"/>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="adminLogout"/>
         </after>
 
diff --git a/app/code/Magento/Widget/Test/Mftf/Test/ProductsListWidgetTest.xml b/app/code/Magento/Widget/Test/Mftf/Test/ProductsListWidgetTest.xml
index 30b4f46c791e8..9a1aafc649845 100644
--- a/app/code/Magento/Widget/Test/Mftf/Test/ProductsListWidgetTest.xml
+++ b/app/code/Magento/Widget/Test/Mftf/Test/ProductsListWidgetTest.xml
@@ -34,6 +34,7 @@
         <!-- Create a CMS page containing the Products List widget -->
         <amOnPage url="{{CmsPagesPage.url}}" stepKey="amOnCmsList"/>
         <waitForPageLoad stepKey="waitForCmsList"/>
+        <conditionalClick selector="{{AdminDataGridHeaderSection.clearFilters}}" dependentSelector="{{AdminDataGridHeaderSection.clearFilters}}" visible="true" stepKey="clickClearFilters"/>
         <click selector="{{CmsPagesPageActionsSection.addNewPageButton}}" stepKey="clickAddNewPageButton"/>
         <fillField selector="{{CmsNewPagePageBasicFieldsSection.pageTitle}}" userInput="{{_newDefaultCmsPage.title}}" stepKey="fillPageTitle"/>
         <click selector="{{CmsNewPagePageContentSection.header}}" stepKey="expandContentSection"/>

From 432e9e26a32b84f47d5aa8bcfaa0d33c474a2f13 Mon Sep 17 00:00:00 2001
From: Sathish <srsathish92@gmail.com>
Date: Fri, 8 May 2020 20:07:07 +0530
Subject: [PATCH 091/120] Added translate

---
 app/code/Magento/CatalogInventory/i18n/en_US.csv              | 1 +
 .../view/adminhtml/ui_component/product_form.xml              | 4 ++--
 app/code/Magento/Customer/i18n/en_US.csv                      | 1 +
 .../Magento/Customer/view/base/ui_component/customer_form.xml | 2 +-
 4 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/app/code/Magento/CatalogInventory/i18n/en_US.csv b/app/code/Magento/CatalogInventory/i18n/en_US.csv
index 19b73f847b46d..af989dc06d47e 100644
--- a/app/code/Magento/CatalogInventory/i18n/en_US.csv
+++ b/app/code/Magento/CatalogInventory/i18n/en_US.csv
@@ -70,3 +70,4 @@ Stock,Stock
 "Use Config Settings","Use Config Settings"
 "Qty Uses Decimals","Qty Uses Decimals"
 "Allow Multiple Boxes for Shipping","Allow Multiple Boxes for Shipping"
+"Done","Done"
diff --git a/app/code/Magento/CatalogInventory/view/adminhtml/ui_component/product_form.xml b/app/code/Magento/CatalogInventory/view/adminhtml/ui_component/product_form.xml
index 27ce26cabc627..6c33233704148 100644
--- a/app/code/Magento/CatalogInventory/view/adminhtml/ui_component/product_form.xml
+++ b/app/code/Magento/CatalogInventory/view/adminhtml/ui_component/product_form.xml
@@ -11,7 +11,7 @@
             <options>
                 <option name="buttons" xsi:type="array">
                     <item name="0" xsi:type="array">
-                        <item name="text" xsi:type="string">Done</item>
+                        <item name="text" xsi:type="string" translate="true">Done</item>
                         <item name="class" xsi:type="string">action-primary</item>
                         <item name="actions" xsi:type="array">
                             <item name="0" xsi:type="array">
@@ -21,7 +21,7 @@
                         </item>
                     </item>
                 </option>
-                <option name="title" xsi:type="string">Advanced Inventory</option>
+                <option name="title" xsi:type="string" translate="true">Advanced Inventory</option>
             </options>
             <onCancel>actionDone</onCancel>
             <dataScope>data.product</dataScope>
diff --git a/app/code/Magento/Customer/i18n/en_US.csv b/app/code/Magento/Customer/i18n/en_US.csv
index bb6c4b10bf75e..7c88ffec1170a 100644
--- a/app/code/Magento/Customer/i18n/en_US.csv
+++ b/app/code/Magento/Customer/i18n/en_US.csv
@@ -541,3 +541,4 @@ Addresses,Addresses
 "The Date of Birth should not be greater than today.","The Date of Birth should not be greater than today."
 "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"
diff --git a/app/code/Magento/Customer/view/base/ui_component/customer_form.xml b/app/code/Magento/Customer/view/base/ui_component/customer_form.xml
index b9487037da2cc..78bbd612f5b70 100644
--- a/app/code/Magento/Customer/view/base/ui_component/customer_form.xml
+++ b/app/code/Magento/Customer/view/base/ui_component/customer_form.xml
@@ -474,7 +474,7 @@
         <modal name="customer_address_update_modal">
             <settings>
                 <options>
-                    <option name="title" xsi:type="string">Add/Update Address</option>
+                    <option name="title" xsi:type="string" translate="true">Add/Update Address</option>
                 </options>
             </settings>
             <insertForm name="update_customer_address_form_loader" component="Magento_Customer/js/form/components/insert-form">

From 81dc8ce70ff040d641d90ad68a9097aed4f404c8 Mon Sep 17 00:00:00 2001
From: sdzhepa <sdzhepa@adobe.com>
Date: Fri, 8 May 2020 13:45:38 -0500
Subject: [PATCH 092/120] Update Issue and PR templates

---
 .github/ISSUE_TEMPLATE/bug_report.md                 | 11 ++++++++++-
 .github/ISSUE_TEMPLATE/developer-experience-issue.md |  9 +++++++++
 .github/PULL_REQUEST_TEMPLATE.md                     |  2 +-
 3 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index 54479c5d99c38..d7153a5973bdf 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -11,7 +11,7 @@ Fields marked with (*) are required. Please don't remove the template.
 
 ### Preconditions (*)
 <!---
-Provide the exact Magento version (example: 2.3.2) and any important information on the environment where bug is reproducible.
+Provide the exact Magento version (example: 2.4.0) and any important information on the environment where bug is reproducible.
 -->
 1.
 2.
@@ -32,3 +32,12 @@ Important: Provide a set of clear steps to reproduce this bug. We can not provid
 <!--- Tell us what happened instead. Include error messages and issues. -->
 1. [Screenshots, logs or description]
 2.
+
+---
+Please provide [Severity](https://devdocs.magento.com/guides/v2.3/contributor-guide/contributing.html#backlog) assessment for the Issue as Reporter. This information will help during Confirmation and Issue triage processes.
+
+- [ ] Severity: **S0** _- Affects critical data or functionality and leaves users with no workaround._
+- [ ] Severity: **S1** _- Affects critical data or functionality and forces users to employ a workaround._
+- [ ] Severity: **S2** _- Affects non-critical data or functionality and forces users to employ a workaround._
+- [ ] Severity: **S3** _- Affects non-critical data or functionality and does not force users to employ a workaround._
+- [ ] Severity: **S4** _- Affects aesthetics, professional look and feel, “quality” or “usability”._
\ No newline at end of file
diff --git a/.github/ISSUE_TEMPLATE/developer-experience-issue.md b/.github/ISSUE_TEMPLATE/developer-experience-issue.md
index 713ce410a16e1..db5fca78965d6 100644
--- a/.github/ISSUE_TEMPLATE/developer-experience-issue.md
+++ b/.github/ISSUE_TEMPLATE/developer-experience-issue.md
@@ -18,3 +18,12 @@ Fields marked with (*) are required. Please don't remove the template.
 
 ### Proposed solution
 <!--- Suggest your potential solutions for this issue. -->
+
+---
+Please provide [Severity](https://devdocs.magento.com/guides/v2.3/contributor-guide/contributing.html#backlog) assessment for the Issue as Reporter. This information will help during Confirmation and Issue triage processes.
+
+- [ ] Severity: **S0** _- Affects critical data or functionality and leaves users with no workaround._
+- [ ] Severity: **S1** _- Affects critical data or functionality and forces users to employ a workaround._
+- [ ] Severity: **S2** _- Affects non-critical data or functionality and forces users to employ a workaround._
+- [ ] Severity: **S3** _- Affects non-critical data or functionality and does not force users to employ a workaround._
+- [ ] Severity: **S4** _- Affects aesthetics, professional look and feel, “quality” or “usability”._
\ No newline at end of file
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index 5d6620ce19228..2856223c5ed1b 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -23,7 +23,7 @@
     If relevant, please provide a list of fixed issues in the format magento/magento2#<issue_number>.
     There could be 1 or more issues linked here and it will help us find some more information about the reasoning behind this change.
 -->
-1. magento/magento2#<issue_number>: Issue title
+1. Fixes magento/magento2#<issue_number>
 
 ### Manual testing scenarios (*)
 <!---

From 1569680e462af2047407df5b05ac82add18d6420 Mon Sep 17 00:00:00 2001
From: Serhii Dzhepa <sdzhepa@adobe.com>
Date: Mon, 11 May 2020 10:44:35 -0500
Subject: [PATCH 093/120] Update bug_report.md

Fix based on code review
---
 .github/ISSUE_TEMPLATE/bug_report.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index d7153a5973bdf..e4633e187480f 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -36,8 +36,8 @@ Important: Provide a set of clear steps to reproduce this bug. We can not provid
 ---
 Please provide [Severity](https://devdocs.magento.com/guides/v2.3/contributor-guide/contributing.html#backlog) assessment for the Issue as Reporter. This information will help during Confirmation and Issue triage processes.
 
-- [ ] Severity: **S0** _- Affects critical data or functionality and leaves users with no workaround._
+- [ ] Severity: **S0** _- Affects critical data or functionality and leaves users without workaround._
 - [ ] Severity: **S1** _- Affects critical data or functionality and forces users to employ a workaround._
 - [ ] Severity: **S2** _- Affects non-critical data or functionality and forces users to employ a workaround._
 - [ ] Severity: **S3** _- Affects non-critical data or functionality and does not force users to employ a workaround._
-- [ ] Severity: **S4** _- Affects aesthetics, professional look and feel, “quality” or “usability”._
\ No newline at end of file
+- [ ] Severity: **S4** _- Affects aesthetics, professional look and feel, “quality” or “usability”._

From 8abc9e121a8e65341f9a415b2041b438e048a1dd Mon Sep 17 00:00:00 2001
From: Roman Lytvynenko <lytvynen@adobe.com>
Date: Mon, 11 May 2020 16:23:14 -0500
Subject: [PATCH 094/120] MC-33700: TransportBuilder unable to send emails of
 Content-Type "text/plain"

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

diff --git a/dev/tests/integration/testsuite/Magento/Framework/Mail/TransportBuilderTest.php b/dev/tests/integration/testsuite/Magento/Framework/Mail/TransportBuilderTest.php
index 7780f51ee2b5b..9dc8aa91237d8 100644
--- a/dev/tests/integration/testsuite/Magento/Framework/Mail/TransportBuilderTest.php
+++ b/dev/tests/integration/testsuite/Magento/Framework/Mail/TransportBuilderTest.php
@@ -81,7 +81,7 @@ public function testAddToEmail($email)
         /** @var EmailMessage $emailMessage */
         $emailMessage = $this->builder->getTransport()->getMessage();
 
-        $this->assertContains($templateType, $emailMessage->getHeaders()['Content-Type']);
+        $this->assertStringContainsStringIgnoringCase($templateType, $emailMessage->getHeaders()['Content-Type']);
 
         $addresses = $emailMessage->getTo();
 

From 0e0ee91811393019575ded23bb134bc5187d52d7 Mon Sep 17 00:00:00 2001
From: "rostyslav.hymon" <rostyslav.hymon@transoftgroup.com>
Date: Tue, 12 May 2020 09:54:59 +0300
Subject: [PATCH 095/120] MC-32634: Default store and view are disappearing
 after changing Default website code and using exported config.php to install
 magento

---
 .../Importer/DataDifferenceCalculator.php     | 40 ++++++++++++++++++-
 .../scopes/config_with_changed_stores.php     |  4 +-
 2 files changed, 41 insertions(+), 3 deletions(-)

diff --git a/app/code/Magento/Store/Model/Config/Importer/DataDifferenceCalculator.php b/app/code/Magento/Store/Model/Config/Importer/DataDifferenceCalculator.php
index 75fbe23d78f8b..fac02bfb92b3f 100644
--- a/app/code/Magento/Store/Model/Config/Importer/DataDifferenceCalculator.php
+++ b/app/code/Magento/Store/Model/Config/Importer/DataDifferenceCalculator.php
@@ -20,6 +20,17 @@ class DataDifferenceCalculator
      */
     private $runtimeConfigSource;
 
+    /**
+     * Scopes identifier
+     *
+     * @var string[]
+     */
+    private $identifiers = [
+        'websites' => 'website_id',
+        'groups' => 'group_id',
+        'stores' => 'store_id',
+    ];
+
     /**
      * @param ConfigSourceInterface $runtimeConfigSource The config source to retrieve current config
      */
@@ -28,6 +39,31 @@ public function __construct(ConfigSourceInterface $runtimeConfigSource)
         $this->runtimeConfigSource = $runtimeConfigSource;
     }
 
+    /**
+     * Update data by checking ID
+     *
+     * @param string $scope
+     * @param array $data
+     * @param array $runtimeScopeData
+     * @return array
+     */
+    private function updateDataById(string $scope, array $data, array $runtimeScopeData): array
+    {
+        $diffData = array_diff_key($data, $runtimeScopeData);
+        foreach ($diffData as $code => $datum) {
+            foreach ($runtimeScopeData as $runTimeScopeCode => $runtimeScopeDatum) {
+                if (isset($datum[$this->identifiers[$scope]])
+                    && $datum[$this->identifiers[$scope]] === $runtimeScopeDatum[$this->identifiers[$scope]]
+                ) {
+                    $data[$runTimeScopeCode] = $data[$code];
+                    unset($data[$code]);
+                }
+            }
+        }
+
+        return $data;
+    }
+
     /**
      * Calculates items to delete.
      *
@@ -41,6 +77,7 @@ public function getItemsToDelete($scope, array $data)
         $runtimeScopeData = $this->changeDataKeyToCode(
             $this->getRuntimeData($scope)
         );
+        $data = $this->updateDataById($scope, $data, $runtimeScopeData);
 
         return array_diff_key($runtimeScopeData, $data);
     }
@@ -58,6 +95,7 @@ public function getItemsToCreate($scope, array $data)
         $runtimeScopeData = $this->changeDataKeyToCode(
             $this->getRuntimeData($scope)
         );
+        $data = $this->updateDataById($scope, $data, $runtimeScopeData);
 
         return array_diff_key($data, $runtimeScopeData);
     }
@@ -77,7 +115,7 @@ public function getItemsToUpdate($scope, array $data)
         $runtimeScopeData = $this->changeDataKeyToCode(
             $this->getRuntimeData($scope)
         );
-
+        $data = $this->updateDataById($scope, $data, $runtimeScopeData);
         foreach ($runtimeScopeData as $entityCode => $entityData) {
             if (isset($data[$entityCode]) && array_diff_assoc($entityData, $data[$entityCode])) {
                 $itemsToUpdate[$entityCode] = array_replace($entityData, $data[$entityCode]);
diff --git a/dev/tests/integration/testsuite/Magento/Deploy/_files/scopes/config_with_changed_stores.php b/dev/tests/integration/testsuite/Magento/Deploy/_files/scopes/config_with_changed_stores.php
index e9e754d15da9c..a3e95fcb34bc8 100644
--- a/dev/tests/integration/testsuite/Magento/Deploy/_files/scopes/config_with_changed_stores.php
+++ b/dev/tests/integration/testsuite/Magento/Deploy/_files/scopes/config_with_changed_stores.php
@@ -14,9 +14,9 @@
                 'default_group_id' => '0',
                 'is_default' => '0',
             ],
-            'base' => [
+            'base_code_changed' => [
                 'website_id' => '1',
-                'code' => 'base',
+                'code' => 'base_code_changed',
                 'name' => 'Main Website',
                 'sort_order' => '0',
                 'default_group_id' => '1',

From 3e5d59d11e270ae18713f1254603f9df5c07acb7 Mon Sep 17 00:00:00 2001
From: Vasya Tsviklinskyi <tsviklinskyi@gmail.com>
Date: Tue, 12 May 2020 10:52:21 +0300
Subject: [PATCH 096/120] MC-33494: Unable to place order from admin using
 Stored Cards (Braintree)

---
 .../Braintree/view/adminhtml/web/js/vault.js  |  6 +--
 .../Vault/view/adminhtml/web/js/vault.js      | 42 +++++++++++++++++--
 2 files changed, 41 insertions(+), 7 deletions(-)

diff --git a/app/code/Magento/Braintree/view/adminhtml/web/js/vault.js b/app/code/Magento/Braintree/view/adminhtml/web/js/vault.js
index a1a1c81d27c3d..0c9694023c6d4 100644
--- a/app/code/Magento/Braintree/view/adminhtml/web/js/vault.js
+++ b/app/code/Magento/Braintree/view/adminhtml/web/js/vault.js
@@ -131,7 +131,7 @@ define([
             this.createPublicHashSelector();
 
             this.$selector.find('[name="payment[public_hash]"]').val(this.publicHash);
-            this.$container.find('#' + this.getNonceSelectorName()).val(nonce);
+            $('#' + this.getNonceSelectorName()).val(nonce);
         },
 
         /**
@@ -140,7 +140,7 @@ define([
         createPublicHashSelector: function () {
             var $input;
 
-            if (this.$container.find('#' + this.getNonceSelectorName()).size() === 0) {
+            if ($('#' + this.getNonceSelectorName()).length === 0) {
                 $input = $('<input>').attr(
                     {
                         type: 'hidden',
@@ -149,7 +149,7 @@ define([
                     }
                 );
 
-                $input.appendTo(this.$container);
+                $input.appendTo($('#edit_form'));
                 $input.prop('disabled', false);
             }
         },
diff --git a/app/code/Magento/Vault/view/adminhtml/web/js/vault.js b/app/code/Magento/Vault/view/adminhtml/web/js/vault.js
index 68597f3d8adb9..1d0305a7046ab 100644
--- a/app/code/Magento/Vault/view/adminhtml/web/js/vault.js
+++ b/app/code/Magento/Vault/view/adminhtml/web/js/vault.js
@@ -27,18 +27,26 @@ define([
          * @returns {exports.initObservable}
          */
         initObservable: function () {
-            var self = this;
+            var self = this,
+                paymentSelector = '[name="payment[method]"][value="' + this.getCode() + '"]:checked';
 
             self.$selector = $('#' + self.selector);
             this._super()
                 .observe(['active']);
 
+            if (self.$selector.find(paymentSelector).length !== 0) {
+                this.active(true);
+            }
+
+            $('#' + self.fieldset).find('[name="payment[token_switcher]"]')
+                .on('click', this.rememberTokenSwitcher.bind(this));
+
             // re-init payment method events
             self.$selector.off('changePaymentMethod.' + this.getCode())
                 .on('changePaymentMethod.' + this.getCode(), this.changePaymentMethod.bind(this));
 
             if (this.active()) {
-                $('#' + this.fieldset + ' input:radio:first').trigger('click');
+                this.chooseTokenSwitcher();
             }
 
             return this;
@@ -56,6 +64,33 @@ define([
             return this;
         },
 
+        /**
+         * Save last chosen token switcher
+         * @param {Object} event
+         * @returns {exports.rememberTokenSwitcher}
+         */
+        rememberTokenSwitcher: function (event) {
+            $('#' + this.selector).data('lastTokenSwitcherId', event.target.id);
+
+            return this;
+        },
+
+        /**
+         * Select token switcher
+         * @returns {exports.chooseTokenSwitcher}
+         */
+        chooseTokenSwitcher: function () {
+            var lastTokenSwitcherId = $('#' + this.selector).data('lastTokenSwitcherId');
+
+            if (lastTokenSwitcherId) {
+                $('#' + lastTokenSwitcherId).trigger('click');
+            } else {
+                $('#' + this.fieldset + ' input:radio:first').trigger('click');
+            }
+
+            return this;
+        },
+
         /**
          * Triggered when payment changed
          * @param {Boolean} isActive
@@ -66,8 +101,7 @@ define([
 
                 return;
             }
-
-            $('#' + this.fieldset + ' input:radio:first').trigger('click');
+            this.chooseTokenSwitcher();
             window.order.addExcludedPaymentMethod(this.getCode());
         },
 

From 47994a9a5f8af9c5d9c0c98cbf607169fcb9f24e Mon Sep 17 00:00:00 2001
From: Vasya Tsviklinskyi <tsviklinskyi@gmail.com>
Date: Tue, 12 May 2020 16:36:51 +0300
Subject: [PATCH 097/120] MC-33572: Special price API only works with schedule
 update

---
 .../Catalog/Api/SpecialPriceStorageTest.php   | 145 +++++++++++++-----
 1 file changed, 106 insertions(+), 39 deletions(-)

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 a0bad2c69ee1f..ef374dc1873cf 100644
--- a/dev/tests/api-functional/testsuite/Magento/Catalog/Api/SpecialPriceStorageTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/Catalog/Api/SpecialPriceStorageTest.php
@@ -5,20 +5,28 @@
  */
 namespace Magento\Catalog\Api;
 
+use Magento\Catalog\Api\Data\ProductInterface;
+use Magento\Framework\Exception\CouldNotSaveException;
+use Magento\Framework\Exception\InputException;
+use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\Framework\Exception\StateException;
+use Magento\Framework\Webapi\Rest\Request;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\TestFramework\ObjectManager;
 use Magento\TestFramework\TestCase\WebapiAbstract;
-use Magento\Framework\Webapi\Exception as HTTPExceptionCodes;
 
 /**
- * SpecialPriceStorage test.
+ * SpecialPriceStorage API operations test
  */
 class SpecialPriceStorageTest extends WebapiAbstract
 {
     const SERVICE_NAME = 'catalogSpecialPriceStorageV1';
     const SERVICE_VERSION = 'V1';
     const SIMPLE_PRODUCT_SKU = 'simple';
+    const VIRTUAL_PRODUCT_SKU = 'virtual-product';
 
     /**
-     * @var \Magento\TestFramework\ObjectManager
+     * @var ObjectManager
      */
     private $objectManager;
 
@@ -27,7 +35,7 @@ class SpecialPriceStorageTest extends WebapiAbstract
      */
     protected function setUp(): void
     {
-        $this->objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+        $this->objectManager = Bootstrap::getObjectManager();
     }
 
     /**
@@ -38,14 +46,14 @@ protected function setUp(): void
     public function testGet()
     {
         $specialPrice = 3057;
-        $productRepository = $this->objectManager->create(\Magento\Catalog\Api\ProductRepositoryInterface::class);
+        $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' => \Magento\Framework\Webapi\Rest\Request::HTTP_METHOD_POST
+                'httpMethod' => Request::HTTP_METHOD_POST
             ],
             'soap' => [
                 'service' => self::SERVICE_NAME,
@@ -54,7 +62,7 @@ public function testGet()
             ],
         ];
         $response = $this->_webApiCall($serviceInfo, ['skus' => [self::SIMPLE_PRODUCT_SKU]]);
-        /** @var \Magento\Catalog\Api\Data\ProductInterface $product */
+        /** @var ProductInterface $product */
         $product = $productRepository->get(self::SIMPLE_PRODUCT_SKU);
         $this->assertNotEmpty($response);
         $this->assertEquals($product->getSpecialPrice(), $response[0]['price']);
@@ -64,14 +72,15 @@ public function testGet()
      * Test update method.
      *
      * @magentoApiDataFixture Magento/Catalog/_files/product_virtual.php
+     * @dataProvider updateData
+     * @param array $data
      */
-    public function testUpdate()
+    public function testUpdate(array $data)
     {
-        $sku = 'virtual-product';
         $serviceInfo = [
             'rest' => [
                 'resourcePath' => '/V1/products/special-price',
-                'httpMethod' => \Magento\Framework\Webapi\Rest\Request::HTTP_METHOD_POST
+                'httpMethod' => Request::HTTP_METHOD_POST
             ],
             'soap' => [
                 'service' => self::SERVICE_NAME,
@@ -79,19 +88,11 @@ public function testUpdate()
                 'operation' => self::SERVICE_NAME . 'Update',
             ],
         ];
-        $storeId = 0;
-        $newPrice = 31337;
         $response = $this->_webApiCall(
             $serviceInfo,
             [
                 'prices' => [
-                    [
-                        'price' => $newPrice,
-                        'store_id' => $storeId,
-                        'sku' => $sku,
-                        'price_from' => '2037-01-19 03:14:07',
-                        'price_to' => '2038-01-19 03:14:07',
-                    ]
+                    $data
                 ]
             ]
         );
@@ -102,23 +103,28 @@ public function testUpdate()
      * Test delete method.
      *
      * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
+     * @dataProvider deleteData
+     * @param array $data
+     * @throws CouldNotSaveException
+     * @throws InputException
+     * @throws NoSuchEntityException
+     * @throws StateException
      */
-    public function testDelete()
+    public function testDelete(array $data)
     {
-        $specialPrice = 3057;
-        /** @var \Magento\Catalog\Api\ProductRepositoryInterface $productRepository */
-        $productRepository = $this->objectManager->create(\Magento\Catalog\Api\ProductRepositoryInterface::class);
-        $fromDate = '1970-01-01 00:00:01';
-        $toDate = '2038-01-19 03:14:07';
-        $product = $productRepository->get(self::SIMPLE_PRODUCT_SKU, true);
-        $product->setData('special_price', $specialPrice)
-            ->setData('special_from_date', $fromDate)
-            ->setData('special_to_date', $toDate);
+        /** @var ProductRepositoryInterface $productRepository */
+        $productRepository = $this->objectManager->create(ProductRepositoryInterface::class);
+        $product = $productRepository->get($data['sku'], true);
+        $product->setData('special_price', $data['price']);
+        $product->setData('special_from_date', $data['price_from']);
+        if ($data['price_to']) {
+            $product->setData('special_to_date', $data['price_to']);
+        }
         $productRepository->save($product);
         $serviceInfo = [
             'rest' => [
                 'resourcePath' => '/V1/products/special-price-delete',
-                'httpMethod' => \Magento\Framework\Webapi\Rest\Request::HTTP_METHOD_POST
+                'httpMethod' => Request::HTTP_METHOD_POST
             ],
             'soap' => [
                 'service' => self::SERVICE_NAME,
@@ -130,19 +136,80 @@ public function testDelete()
             $serviceInfo,
             [
                 'prices' => [
-                    [
-                        'price' => $specialPrice,
-                        'store_id' => 0,
-                        'sku' => self::SIMPLE_PRODUCT_SKU,
-                        'price_from' => $fromDate,
-                        'price_to' => $toDate,
-                    ]
+                        $data
                 ]
             ]
         );
-        /** @var \Magento\Catalog\Api\Data\ProductInterface $product */
-        $product = $productRepository->get(self::SIMPLE_PRODUCT_SKU, false, null, true);
+        $product = $productRepository->get($data['sku'], false, null, true);
         $this->assertEmpty($response);
         $this->assertNull($product->getSpecialPrice());
     }
+
+    /**
+     * Data provider for testUpdate
+     *
+     * @return array
+     */
+    public function updateData(): array
+    {
+        $fromDate = '2037-01-19 03:14:07';
+        $toDate = '2038-01-19 03:14:07';
+
+        return [
+            [
+                // data set with 'price_to' specified
+                [
+                    'price' => 31337,
+                    'store_id' => 0,
+                    'sku' => self::VIRTUAL_PRODUCT_SKU,
+                    'price_from' => $fromDate,
+                    'price_to' => $toDate
+                ]
+            ],
+            [
+                // data set without 'price_to' specified
+                [
+                    'price' => 31337,
+                    'store_id' => 0,
+                    'sku' => self::VIRTUAL_PRODUCT_SKU,
+                    'price_from' => $fromDate,
+                    'price_to' => false
+                ]
+            ],
+        ];
+    }
+
+    /**
+     * Data provider for testDelete
+     *
+     * @return array
+     */
+    public function deleteData(): array
+    {
+        $fromDate = '1970-01-01 00:00:01';
+        $toDate = '2038-01-19 03:14:07';
+
+        return [
+            [
+                // data set with 'price_to' specified
+                [
+                    'price' => 3057,
+                    'store_id' => 0,
+                    'sku' => self::SIMPLE_PRODUCT_SKU,
+                    'price_from' => $fromDate,
+                    'price_to' => $toDate
+                ]
+            ],
+            [
+                // data set without 'price_to' specified
+                [
+                    'price' => 3057,
+                    'store_id' => 0,
+                    'sku' => self::SIMPLE_PRODUCT_SKU,
+                    'price_from' => $fromDate,
+                    'price_to' => false
+                ]
+            ],
+        ];
+    }
 }

From f619400ac3282291a95885905d1fc44d7868c2fe Mon Sep 17 00:00:00 2001
From: Vadim Malesh <51680850+engcom-Charlie@users.noreply.github.com>
Date: Wed, 13 May 2020 12:33:17 +0300
Subject: [PATCH 098/120] fix static

---
 .../Magento/Framework/ObjectManager/Factory/AbstractFactory.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/internal/Magento/Framework/ObjectManager/Factory/AbstractFactory.php b/lib/internal/Magento/Framework/ObjectManager/Factory/AbstractFactory.php
index 735b9454bbfa1..b662a2a34c813 100644
--- a/lib/internal/Magento/Framework/ObjectManager/Factory/AbstractFactory.php
+++ b/lib/internal/Magento/Framework/ObjectManager/Factory/AbstractFactory.php
@@ -130,7 +130,7 @@ protected function createObject($type, $args)
 
             throw new RuntimeException(
                 new Phrase('Type Error occurred when creating object: %type, %msg', [
-                    'type' => $type, 
+                    'type' => $type,
                     'msg' => $exception->getMessage()
                 ])
             );

From 41c8df8d185f7c20559845b0f1155cc4e182c60e Mon Sep 17 00:00:00 2001
From: "rostyslav.hymon" <rostyslav.hymon@transoftgroup.com>
Date: Wed, 13 May 2020 15:32:10 +0300
Subject: [PATCH 099/120] MC-33879: Paypal checkout Shipping method not
 updating correctly

---
 .../Test/Unit/Model/Paypal/Helper/ShippingMethodUpdaterTest.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/Braintree/Test/Unit/Model/Paypal/Helper/ShippingMethodUpdaterTest.php b/app/code/Magento/Braintree/Test/Unit/Model/Paypal/Helper/ShippingMethodUpdaterTest.php
index 05898b2b625a9..4d866458b8053 100644
--- a/app/code/Magento/Braintree/Test/Unit/Model/Paypal/Helper/ShippingMethodUpdaterTest.php
+++ b/app/code/Magento/Braintree/Test/Unit/Model/Paypal/Helper/ShippingMethodUpdaterTest.php
@@ -52,7 +52,7 @@ class ShippingMethodUpdaterTest extends TestCase
     /**
      * @inheritdoc
      */
-    protected function setUp()
+    protected function setUp(): void
     {
         $this->configMock = $this->getMockBuilder(Config::class)
             ->disableOriginalConstructor()

From e28686ffb19860245eee734914a04c15ecb84765 Mon Sep 17 00:00:00 2001
From: "vadim.malesh" <engcom-vendorworker-charlie@adobe.com>
Date: Wed, 13 May 2020 16:47:35 +0300
Subject: [PATCH 100/120] fixed unit test

---
 .../ResourceModel/AbstractResourceTest.php    | 22 +++++++++++++------
 1 file changed, 15 insertions(+), 7 deletions(-)

diff --git a/lib/internal/Magento/Framework/Model/Test/Unit/ResourceModel/AbstractResourceTest.php b/lib/internal/Magento/Framework/Model/Test/Unit/ResourceModel/AbstractResourceTest.php
index 9b8421bddf9fd..f3b8bb74737b7 100644
--- a/lib/internal/Magento/Framework/Model/Test/Unit/ResourceModel/AbstractResourceTest.php
+++ b/lib/internal/Magento/Framework/Model/Test/Unit/ResourceModel/AbstractResourceTest.php
@@ -15,6 +15,9 @@
 use PHPUnit\Framework\TestCase;
 use Psr\Log\LoggerInterface;
 
+/**
+ * Test for \Magento\Framework\Model\ResourceModel\AbstractResource.
+ */
 class AbstractResourceTest extends TestCase
 {
     /**
@@ -32,16 +35,17 @@ class AbstractResourceTest extends TestCase
      */
     private $loggerMock;
 
+    /**
+     * @inheritdoc
+     */
     protected function setUp(): void
-
     {
         $objectManager = new ObjectManager($this);
-        $this->model = $objectManager->getObject(AbstractResourceStub::class);
         $this->serializerMock = $this->createMock(Json::class);
         $this->loggerMock = $this->getMockForAbstractClass(LoggerInterface::class);
-        $this->abstractResource = $objectManager->getObject(AbstractResourceStub::class);
-        $objectManager->setBackwardCompatibleProperty($this->abstractResource, 'serializer', $this->serializerMock);
-        $objectManager->setBackwardCompatibleProperty($this->abstractResource, '_logger', $this->loggerMock);
+        $this->model = $objectManager->getObject(AbstractResourceStub::class);
+        $objectManager->setBackwardCompatibleProperty($this->model, 'serializer', $this->serializerMock);
+        $objectManager->setBackwardCompatibleProperty($this->model, '_logger', $this->loggerMock);
     }
 
     /**
@@ -187,8 +191,12 @@ public function unserializeFieldsDataProvider(): array
         ];
     }
 
-
-    public function testCommitZeroLevel()
+    /**
+     * Commit zero level
+     *
+     * @return void
+     */
+    public function testCommitZeroLevel(): void
     {
         /** @var AdapterInterface|MockObject $connection */
         $connection = $this->getMockForAbstractClass(AdapterInterface::class);

From d4de924bec16ecffd696d5458e8b1049f5dd2667 Mon Sep 17 00:00:00 2001
From: Nikita Shcherbatykh <nikita.shcherbatykh@transoftgroup.com>
Date: Thu, 14 May 2020 15:55:40 +0300
Subject: [PATCH 101/120] MC-25184: The cross-sell products block does not work
 correctly in EE version.

---
 .../Test/Unit/Block/Cart/CrosssellTest.php        | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/app/code/Magento/Checkout/Test/Unit/Block/Cart/CrosssellTest.php b/app/code/Magento/Checkout/Test/Unit/Block/Cart/CrosssellTest.php
index b2535dcc3a9b1..8ab2e266238e1 100644
--- a/app/code/Magento/Checkout/Test/Unit/Block/Cart/CrosssellTest.php
+++ b/app/code/Magento/Checkout/Test/Unit/Block/Cart/CrosssellTest.php
@@ -66,7 +66,7 @@ class CrosssellTest extends TestCase
     /**
      * @inheritDoc
      */
-    protected function setUp()
+    protected function setUp(): void
     {
         $objectManager = new ObjectManager($this);
         $this->storeManager = $this->createMock(
@@ -78,13 +78,12 @@ protected function setUp()
                 'storeManager' => $this->storeManager
             ]
         );
-        $this->checkoutSession = $this->createPartialMock(
-            Session::class,
-            [
-                'getQuote',
-                'getLastAddedProductId'
-            ]
-        );
+        $this->checkoutSession = $this
+            ->getMockBuilder(Session::class)
+            ->addMethods(['getLastAddedProductId'])
+            ->onlyMethods(['getQuote'])
+            ->disableOriginalConstructor()
+            ->getMock();
         $this->productRepository = $this->createMock(
             ProductRepositoryInterface::class
         );

From ef9096869e0b04605b4dc265a5925b08bf7880c9 Mon Sep 17 00:00:00 2001
From: Nikita Shcherbatykh <nikita.shcherbatykh@transoftgroup.com>
Date: Thu, 14 May 2020 15:56:36 +0300
Subject: [PATCH 102/120] MC-25184: The cross-sell products block does not work
 correctly in EE version.

---
 .../Magento/Checkout/Test/Unit/Block/Cart/CrosssellTest.php    | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/app/code/Magento/Checkout/Test/Unit/Block/Cart/CrosssellTest.php b/app/code/Magento/Checkout/Test/Unit/Block/Cart/CrosssellTest.php
index 8ab2e266238e1..5eedb42744902 100644
--- a/app/code/Magento/Checkout/Test/Unit/Block/Cart/CrosssellTest.php
+++ b/app/code/Magento/Checkout/Test/Unit/Block/Cart/CrosssellTest.php
@@ -78,8 +78,7 @@ protected function setUp(): void
                 'storeManager' => $this->storeManager
             ]
         );
-        $this->checkoutSession = $this
-            ->getMockBuilder(Session::class)
+        $this->checkoutSession = $this->getMockBuilder(Session::class)
             ->addMethods(['getLastAddedProductId'])
             ->onlyMethods(['getQuote'])
             ->disableOriginalConstructor()

From 6b1b1a35af117b47c10872d9658f3d339c1f2c1e Mon Sep 17 00:00:00 2001
From: "vadim.malesh" <engcom-vendorworker-charlie@adobe.com>
Date: Thu, 14 May 2020 15:59:19 +0300
Subject: [PATCH 103/120] integration test

---
 .../Model/Indexer/Category/ProductTest.php    | 172 ++++++++++++------
 1 file changed, 113 insertions(+), 59 deletions(-)

diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Model/Indexer/Category/ProductTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Model/Indexer/Category/ProductTest.php
index 7082b9cb7cbdb..8e11efa8790cf 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/Model/Indexer/Category/ProductTest.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Model/Indexer/Category/ProductTest.php
@@ -5,49 +5,70 @@
  */
 namespace Magento\Catalog\Model\Indexer\Category;
 
+use Magento\Catalog\Api\CategoryRepositoryInterface;
 use Magento\Catalog\Model\Category;
+use Magento\Catalog\Model\Indexer\Category\Product as CategoryProductIndexer;
+use Magento\Catalog\Model\Product as ProductModel;
+use Magento\Catalog\Model\ResourceModel\Category as CategoryResource;
+use Magento\Catalog\Model\ResourceModel\Product as ProductResource;
+use Magento\Framework\Indexer\IndexerInterface;
+use Magento\Framework\Indexer\StateInterface;
+use Magento\Indexer\Model\Indexer;
+use Magento\TestFramework\Catalog\Model\GetCategoryByName;
+use Magento\TestFramework\Helper\Bootstrap;
+use PHPUnit\Framework\TestCase;
 
 /**
+ * Test for catalog_category_product indexer.
+ *
  * @magentoDataFixture Magento/Catalog/_files/indexer_catalog_category.php
  * @magentoDataFixture Magento/Catalog/_files/indexer_catalog_products.php
  * @magentoDbIsolation disabled
  * @magentoAppIsolation enabled
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
-class ProductTest extends \PHPUnit\Framework\TestCase
+class ProductTest extends TestCase
 {
-    const DEFAULT_ROOT_CATEGORY = 2;
+    private const DEFAULT_ROOT_CATEGORY = 2;
 
     /**
-     * @var \Magento\Framework\Indexer\IndexerInterface
+     * @var IndexerInterface
      */
-    protected $indexer;
+    private $indexer;
 
     /**
-     * @var \Magento\Catalog\Model\ResourceModel\Product
+     * @var ProductResource
      */
-    protected $productResource;
+    private $productResource;
 
     /**
-     * @var \Magento\Catalog\Api\CategoryRepositoryInterface
+     * @var CategoryRepositoryInterface
      */
     private $categoryRepository;
 
-    protected function setUp(): void
-    {
-        /** @var \Magento\Framework\Indexer\IndexerInterface indexer */
-        $this->indexer = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
-            \Magento\Indexer\Model\Indexer::class
-        );
-        $this->indexer->load('catalog_category_product');
+    /**
+     * @var GetCategoryByName
+     */
+    private $getCategoryByName;
 
-        /** @var \Magento\Catalog\Model\ResourceModel\Product $productResource */
-        $this->productResource = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
-            \Magento\Catalog\Model\ResourceModel\Product::class
-        );
+    /**
+     * @var CategoryResource
+     */
+    private $categoryResource;
 
-        $this->categoryRepository = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
-            \Magento\Catalog\Api\CategoryRepositoryInterface::class
-        );
+    /**
+     * @inheritdoc
+     */
+    protected function setUp(): void
+    {
+        /** @var IndexerInterface indexer */
+        $this->indexer = Bootstrap::getObjectManager()->create(Indexer::class);
+        $this->indexer->load(CategoryProductIndexer::INDEXER_ID);
+
+        $this->productResource = Bootstrap::getObjectManager()->get(ProductResource::class);
+        $this->categoryRepository = Bootstrap::getObjectManager()->create(CategoryRepositoryInterface::class);
+        $this->categoryResource = Bootstrap::getObjectManager()->create(CategoryResource::class);
+        $this->getCategoryByName = Bootstrap::getObjectManager()->create(GetCategoryByName::class);
     }
 
     /**
@@ -61,7 +82,7 @@ public function testReindexAll()
         /** @var Category $categoryFourth */
         $categoryFourth = end($categories);
         foreach ($products as $product) {
-            /** @var \Magento\Catalog\Model\Product $product */
+            /** @var ProductModel $product */
             $product->setCategoryIds([$categoryFourth->getId()]);
             $product->save();
         }
@@ -77,7 +98,7 @@ public function testReindexAll()
         $this->indexer->reindexAll();
 
         foreach ($products as $product) {
-            /** @var \Magento\Catalog\Model\Product $product */
+            /** @var ProductModel $product */
             foreach ($categories as $categoryId) {
                 $this->assertTrue((bool)$this->productResource->canBeShowInCategory($product, $categoryId));
             }
@@ -99,7 +120,7 @@ public function testCategoryMove()
         /** @var Category $categoryFourth */
         $categoryFourth = end($categories);
         foreach ($products as $product) {
-            /** @var \Magento\Catalog\Model\Product $product */
+            /** @var ProductModel $product */
             $product->setCategoryIds([$categoryFourth->getId()]);
             $product->save();
         }
@@ -125,7 +146,7 @@ public function testCategoryMove()
         $categories = [self::DEFAULT_ROOT_CATEGORY, $categorySecond->getId(), $categoryFourth->getId()];
 
         foreach ($products as $product) {
-            /** @var \Magento\Catalog\Model\Product $product */
+            /** @var ProductModel $product */
             foreach ($categories as $categoryId) {
                 $this->assertTrue((bool)$this->productResource->canBeShowInCategory($product, $categoryId));
             }
@@ -153,7 +174,7 @@ public function testCategoryDelete()
         $categories = [$categorySecond->getId(), $categoryFourth->getId()];
 
         foreach ($products as $product) {
-            /** @var \Magento\Catalog\Model\Product $product */
+            /** @var ProductModel $product */
             foreach ($categories as $categoryId) {
                 $this->assertFalse((bool)$this->productResource->canBeShowInCategory($product, $categoryId));
             }
@@ -178,22 +199,15 @@ public function testCategoryCreate()
         $categoryFourth = end($categories);
 
         /** @var Category $categorySixth */
-        $categorySixth = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
-            \Magento\Catalog\Model\Category::class
-        );
-        $categorySixth->setName(
-            'Category 6'
-        )->setPath(
-            $categoryFourth->getPath()
-        )->setAvailableSortBy(
-            'name'
-        )->setDefaultSortBy(
-            'name'
-        )->setIsActive(
-            true
-        )->save();
-
-        /** @var \Magento\Catalog\Model\Product $productThird */
+        $categorySixth = Bootstrap::getObjectManager()->create(Category::class);
+        $categorySixth->setName('Category 6')
+            ->setPath($categoryFourth->getPath())
+            ->setAvailableSortBy('name')
+            ->setDefaultSortBy('name')
+            ->setIsActive(true)
+            ->save();
+
+        /** @var ProductModel $productThird */
         $productThird = end($products);
         $productThird->setCategoryIds([$categorySixth->getId()]);
         $productThird->save();
@@ -211,33 +225,64 @@ public function testCategoryCreate()
 
     /**
      * @magentoAppArea adminhtml
-     * @depends testReindexAll
+     *
+     * @magentoDataFixture Magento/Catalog/_files/category_tree.php
+     *
+     * @return void
      */
-    public function testCatalogCategoryProductIndexInvalidateAfterDelete()
+    public function testCatalogCategoryProductIndexInvalidateAfterDelete(): void
     {
-        $indexerShouldBeValid = (bool)$this->indexer->isInvalid();
+        $this->indexer->reindexAll();
+        $indexerShouldBeValid = $this->indexer->isInvalid();
 
-        $categories = $this->getCategories(1);
-        $this->categoryRepository->delete(array_pop($categories));
+        $this->categoryRepository->deleteByIdentifier(400);
 
         $state = $this->indexer->getState();
         $state->loadByIndexer($this->indexer->getId());
         $status = $state->getStatus();
 
         $this->assertFalse($indexerShouldBeValid);
-        $this->assertEquals(\Magento\Framework\Indexer\StateInterface::STATUS_INVALID, $status);
+        $this->assertEquals(StateInterface::STATUS_INVALID, $status);
+    }
+
+    /**
+     * Test invalidate reindex after change product position on category
+     *
+     * @magentoAppArea adminhtml
+     * @magentoDataFixture Magento/Catalog/_files/category_with_different_price_products.php
+     *
+     * @return void
+     */
+    public function testCatalogCategoryProductIndexInvalidateAfterChangeProductPosition(): void
+    {
+        $this->indexer->setScheduled(true);
+        $indexerShouldBeValid = $this->indexer->isValid();
+
+        $category = $this->getCategoryByName->execute('Category 999');
+
+        $category->setPostedProducts([
+            $this->productResource->getIdBySku('simple1000') => 1,
+            $this->productResource->getIdBySku('simple1001') => 2
+        ]);
+
+        $this->categoryResource->save($category);
+
+        $state = $this->indexer->getState();
+        $state->loadByIndexer($this->indexer->getId());
+        $status = $state->getStatus();
+
+        $this->assertTrue($indexerShouldBeValid);
+        $this->assertEquals(StateInterface::STATUS_INVALID, $status);
     }
 
     /**
      * @param int $count
      * @return Category[]
      */
-    protected function getCategories($count)
+    private function getCategories(int $count): array
     {
         /** @var Category $category */
-        $category = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
-            \Magento\Catalog\Model\Category::class
-        );
+        $category = Bootstrap::getObjectManager()->create(Category::class);
 
         $result = $category->getCollection()->addAttributeToSelect('name')->getItems();
         $result = array_slice($result, 2);
@@ -247,14 +292,12 @@ protected function getCategories($count)
 
     /**
      * @param int $count
-     * @return \Magento\Catalog\Model\Product[]
+     * @return ProductModel[]
      */
-    protected function getProducts($count)
+    private function getProducts(int $count): array
     {
-        /** @var \Magento\Catalog\Model\Product $product */
-        $product = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
-            \Magento\Catalog\Model\Product::class
-        );
+        /** @var ProductModel $product */
+        $product = Bootstrap::getObjectManager()->create(ProductModel::class);
 
         $result[] = $product->load(1);
         $result[] = $product->load(2);
@@ -266,7 +309,7 @@ protected function getProducts($count)
     /**
      * Clear index data
      */
-    protected function clearIndex()
+    private function clearIndex()
     {
         $this->productResource->getConnection()->delete(
             $this->productResource->getTable('catalog_category_product_index')
@@ -280,4 +323,15 @@ protected function clearIndex()
         );
         $this->assertFalse($actualResult);
     }
+
+    /**
+     * @inheritdoc
+     */
+    protected function tearDown(): void
+    {
+        parent::tearDown();
+
+        $this->indexer->reindexAll();
+        $this->indexer->setScheduled(false);
+    }
 }

From 80d0f5e43d0d54d0bc40b6aa3cddfc416ba2bb02 Mon Sep 17 00:00:00 2001
From: "rostyslav.hymon" <rostyslav.hymon@transoftgroup.com>
Date: Fri, 15 May 2020 09:32:08 +0300
Subject: [PATCH 104/120] MC-34258: Product mass Update Attributes results in
 blank page

---
 .../product/edit/action/inventory.phtml       | 48 ++++++++++++-------
 1 file changed, 32 insertions(+), 16 deletions(-)

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..1d22624751b32 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
@@ -33,7 +33,7 @@
 $defaultMinSaleQty = $block->getDefaultConfigValue('min_sale_qty');
 if (!is_numeric($defaultMinSaleQty)) {
     $defaultMinSaleQty = json_decode($defaultMinSaleQty, true);
-    $defaultMinSaleQty = (float) $defaultMinSaleQty[\Magento\Customer\Api\Data\GroupInterface::CUST_GROUP_ALL] ?? 1;
+    $defaultMinSaleQty = (float) ($defaultMinSaleQty[\Magento\Customer\Api\Data\GroupInterface::CUST_GROUP_ALL] ?? 1);
 }
 ?>
 <div class="fieldset-wrapper form-inline advanced-inventory-edit">
@@ -52,17 +52,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 +213,15 @@ 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 +242,12 @@ 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"' : '' ?>
-                                <option
-                                    value="<?= $block->escapeHtmlAttr($option['value']) ?>"<?= /* @noEscape */ $_selected ?>><?= $block->escapeHtml($option['label']) ?></option>
+                            <?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>
                             <?php endforeach; ?>
                         </select>
                     </div>
@@ -291,7 +297,9 @@ 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 +322,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 +338,9 @@ 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 +374,9 @@ 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 +397,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>

From 6448147a2521ad3df0a876f20d6e02206451cbab Mon Sep 17 00:00:00 2001
From: "vadim.malesh" <engcom-vendorworker-charlie@adobe.com>
Date: Fri, 15 May 2020 10:19:18 +0300
Subject: [PATCH 105/120] unit test coverage

---
 .../Test/Unit/Factory/CompiledTest.php        | 24 +++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/lib/internal/Magento/Framework/ObjectManager/Test/Unit/Factory/CompiledTest.php b/lib/internal/Magento/Framework/ObjectManager/Test/Unit/Factory/CompiledTest.php
index 8dcc58d63fd2b..73d13aa14b66b 100644
--- a/lib/internal/Magento/Framework/ObjectManager/Test/Unit/Factory/CompiledTest.php
+++ b/lib/internal/Magento/Framework/ObjectManager/Test/Unit/Factory/CompiledTest.php
@@ -7,6 +7,7 @@
 
 namespace Magento\Framework\ObjectManager\Test\Unit\Factory;
 
+use Magento\Framework\Exception\RuntimeException;
 use Magento\Framework\ObjectManager\ConfigInterface;
 use Magento\Framework\ObjectManager\DefinitionInterface;
 use Magento\Framework\ObjectManager\Factory\Compiled;
@@ -19,6 +20,8 @@
 use PHPUnit\Framework\TestCase;
 
 /**
+ * Test for \Magento\Framework\ObjectManager\Factory\Compiled.
+ *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class CompiledTest extends TestCase
@@ -116,6 +119,27 @@ public function testCreateSimple()
         $this->assertNull($result->getNullValue());
     }
 
+    /**
+     * Create class with exception
+     *
+     * @return void
+     */
+    public function testCreateSimpleWithException(): void
+    {
+        $requestedType = 'requestedType';
+        $className = SimpleClassTesting::class;
+
+        $this->config->expects($this->atLeastOnce())
+            ->method('getInstanceType')
+            ->willReturn($className);
+
+        $this->expectException(RuntimeException::class);
+        $this->expectExceptionMessage(
+            'Type Error occurred when creating object: ' . $className . ', Too few arguments to function ' . $className
+        );
+        $this->factory->create($requestedType, []);
+    }
+
     /**
      * Test create simple configured arguments
      */

From a583d6e7728ce456491a135fad5f38848e0037f9 Mon Sep 17 00:00:00 2001
From: Vasya Tsviklinskyi <tsviklinskyi@gmail.com>
Date: Fri, 15 May 2020 10:21:33 +0300
Subject: [PATCH 106/120] MC-25042: Shipping address not selected by default on
 checkout

---
 .../Block/Checkout/AttributeMerger.php        | 21 +++++-
 .../Block/Checkout/LayoutProcessorTest.php    | 66 +++++++++++++++++++
 2 files changed, 84 insertions(+), 3 deletions(-)
 create mode 100644 dev/tests/integration/testsuite/Magento/Checkout/Block/Checkout/LayoutProcessorTest.php

diff --git a/app/code/Magento/Checkout/Block/Checkout/AttributeMerger.php b/app/code/Magento/Checkout/Block/Checkout/AttributeMerger.php
index 1dd1131cde1f1..0e7931146b4c4 100644
--- a/app/code/Magento/Checkout/Block/Checkout/AttributeMerger.php
+++ b/app/code/Magento/Checkout/Block/Checkout/AttributeMerger.php
@@ -10,6 +10,8 @@
 use Magento\Customer\Helper\Address as AddressHelper;
 use Magento\Customer\Model\Session;
 use Magento\Directory\Helper\Data as DirectoryHelper;
+use Magento\Directory\Model\AllowedCountries;
+use Magento\Framework\App\ObjectManager;
 use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\Exception\NoSuchEntityException;
 
@@ -92,23 +94,32 @@ class AttributeMerger
      */
     private $topCountryCodes;
 
+    /**
+     * @var AllowedCountries|null
+     */
+    private $allowedCountryReader;
+
     /**
      * @param AddressHelper $addressHelper
      * @param Session $customerSession
      * @param CustomerRepository $customerRepository
      * @param DirectoryHelper $directoryHelper
+     * @param AllowedCountries $allowedCountryReader
      */
     public function __construct(
         AddressHelper $addressHelper,
         Session $customerSession,
         CustomerRepository $customerRepository,
-        DirectoryHelper $directoryHelper
+        DirectoryHelper $directoryHelper,
+        ?AllowedCountries $allowedCountryReader = null
     ) {
         $this->addressHelper = $addressHelper;
         $this->customerSession = $customerSession;
         $this->customerRepository = $customerRepository;
         $this->directoryHelper = $directoryHelper;
         $this->topCountryCodes = $directoryHelper->getTopCountryCodes();
+        $this->allowedCountryReader =
+            $allowedCountryReader ?: ObjectManager::getInstance()->get(AllowedCountries::class);
     }
 
     /**
@@ -289,7 +300,7 @@ protected function getMultilineFieldConfig($attributeCode, array $attributeConfi
                 'dataScope' => $lineIndex,
                 'provider' => $providerName,
                 'validation' => $isFirstLine
-                //phpcs:ignore Magento2.Performance.ForeachArrayMerge
+                    // phpcs:ignore Magento2.Performance.ForeachArrayMerge
                     ? array_merge(
                         ['required-entry' => (bool)$attributeConfig['required']],
                         $attributeConfig['validation']
@@ -330,7 +341,11 @@ protected function getMultilineFieldConfig($attributeCode, array $attributeConfi
     protected function getDefaultValue($attributeCode): ?string
     {
         if ($attributeCode === 'country_id') {
-            return $this->directoryHelper->getDefaultCountry();
+            $defaultCountryId = $this->directoryHelper->getDefaultCountry();
+            if (!in_array($defaultCountryId, $this->allowedCountryReader->getAllowedCountries())) {
+                $defaultCountryId = null;
+            }
+            return $defaultCountryId;
         }
 
         $customer = $this->getCustomer();
diff --git a/dev/tests/integration/testsuite/Magento/Checkout/Block/Checkout/LayoutProcessorTest.php b/dev/tests/integration/testsuite/Magento/Checkout/Block/Checkout/LayoutProcessorTest.php
new file mode 100644
index 0000000000000..31a96d1584392
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Checkout/Block/Checkout/LayoutProcessorTest.php
@@ -0,0 +1,66 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Checkout\Block\Checkout;
+
+use Magento\Framework\App\Config\MutableScopeConfigInterface;
+use Magento\Store\Model\ScopeInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+use PHPUnit\Framework\TestCase;
+
+class LayoutProcessorTest extends TestCase
+{
+    /**
+     * Tests default country for shipping address.
+     *
+     * @param string $defaultCountryId
+     * @param bool $isCountryValueExpected
+     * @magentoConfigFixture default_store checkout/options/display_billing_address_on 1
+     * @magentoDataFixture Magento/Backend/_files/allowed_countries_fr.php
+     * @dataProvider defaultCountryDataProvider
+     */
+    public function testShippingAddressCountryId(string $defaultCountryId, bool $isCountryValueExpected): void
+    {
+        /** @var MutableScopeConfigInterface $mutableConfig */
+        $mutableConfig = Bootstrap::getObjectManager()->get(MutableScopeConfigInterface::class);
+        $mutableConfig->setValue('general/country/default', $defaultCountryId, ScopeInterface::SCOPE_STORE, 'default');
+
+        /** @var $layoutProcessor LayoutProcessor */
+        $layoutProcessor = Bootstrap::getObjectManager()->get(LayoutProcessor::class);
+
+        $jsLayout['components']['checkout']['children']['steps']['children']['shipping-step']
+        ['children']['shippingAddress']['children']['shipping-address-fieldset']['children'] = [];
+        $data = $layoutProcessor->process($jsLayout);
+
+        $countryId = $data["components"]["checkout"]["children"]["steps"]["children"]["shipping-step"]["children"]
+        ["shippingAddress"]["children"]["shipping-address-fieldset"]["children"]["country_id"];
+
+        $isCountryValueExists = array_key_exists('value', $countryId);
+
+        $this->assertEquals($isCountryValueExpected, $isCountryValueExists);
+        if ($isCountryValueExpected) {
+            $this->assertEquals($defaultCountryId, $countryId['value']);
+        }
+    }
+
+    /**
+     * @return array[]
+     */
+    public function defaultCountryDataProvider(): array
+    {
+        return [
+            'Default country isn\'t in allowed country list' => [
+                'defaultCountryId' => 'US',
+                'isCountryValueExpected' => false
+            ],
+            'Default country is in allowed country list' => [
+                'defaultCountryId' => 'FR',
+                'isCountryValueExpected' => true
+            ],
+        ];
+    }
+}

From c798ca3e1da4bfaaf4c314764b1b4732fa3619c7 Mon Sep 17 00:00:00 2001
From: Serhiy Yelahin <serhiy.yelahin@transoftgroup.com>
Date: Fri, 15 May 2020 15:58:56 +0300
Subject: [PATCH 107/120] MC-33522: [Magento Cloud] - Saving removed Customer
 via Admin generates a report

---
 app/code/Magento/Customer/Controller/Adminhtml/Index/Save.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/Customer/Controller/Adminhtml/Index/Save.php b/app/code/Magento/Customer/Controller/Adminhtml/Index/Save.php
index 12076dc43bd6b..977d3753ded65 100644
--- a/app/code/Magento/Customer/Controller/Adminhtml/Index/Save.php
+++ b/app/code/Magento/Customer/Controller/Adminhtml/Index/Save.php
@@ -248,7 +248,7 @@ protected function _extractData(
      * @param array $extractedCustomerData
      * @return array
      */
-    protected function saveDefaultFlags(array $addressIdList, array & $extractedCustomerData)
+    protected function saveDefaultFlags(array $addressIdList, array &$extractedCustomerData)
     {
         $result = [];
         $extractedCustomerData[CustomerInterface::DEFAULT_BILLING] = null;
@@ -290,7 +290,7 @@ protected function saveDefaultFlags(array $addressIdList, array & $extractedCust
      * @param array $extractedCustomerData
      * @return array
      */
-    protected function _extractCustomerAddressData(array & $extractedCustomerData)
+    protected function _extractCustomerAddressData(array &$extractedCustomerData)
     {
         $addresses = $this->getRequest()->getPost('address');
         $result = [];

From 09bf4774af6b0297dff46a57bb1062017787188e Mon Sep 17 00:00:00 2001
From: "rostyslav.hymon" <rostyslav.hymon@transoftgroup.com>
Date: Fri, 15 May 2020 16:00:12 +0300
Subject: [PATCH 108/120] MC-33879: Paypal checkout Shipping method not
 updating correctly

---
 .../Unit/Model/Paypal/Helper/ShippingMethodUpdaterTest.php   | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/Braintree/Test/Unit/Model/Paypal/Helper/ShippingMethodUpdaterTest.php b/app/code/Magento/Braintree/Test/Unit/Model/Paypal/Helper/ShippingMethodUpdaterTest.php
index 4d866458b8053..518c9496ee26c 100644
--- a/app/code/Magento/Braintree/Test/Unit/Model/Paypal/Helper/ShippingMethodUpdaterTest.php
+++ b/app/code/Magento/Braintree/Test/Unit/Model/Paypal/Helper/ShippingMethodUpdaterTest.php
@@ -80,11 +80,12 @@ protected function setUp(): void
     /**
      * Test execute exception
      *
-     * @expectedException \InvalidArgumentException
-     * @expectedExceptionMessage The "shippingMethod" field does not exists.
+     * @return void
      */
     public function testExecuteException(): void
     {
+        $this->expectException(\InvalidArgumentException::class);
+        $this->expectExceptionMessage("The \"shippingMethod\" field does not exists.");
         $quoteMock = $this->getQuoteMock();
 
         $this->shippingMethodUpdater->execute('', $quoteMock);

From 5711aad1040382918bcd1ac52b647c0ac08e8833 Mon Sep 17 00:00:00 2001
From: Serhii Balko <serhii.balko@transoftgroup.com>
Date: Mon, 18 May 2020 12:03:48 +0300
Subject: [PATCH 109/120] MC-33147: Stabilise integration tests

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

diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Controller/Adminhtml/Product/Gallery/UploadTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Controller/Adminhtml/Product/Gallery/UploadTest.php
index 3aa6c79a35ef1..b88980181fb63 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/Controller/Adminhtml/Product/Gallery/UploadTest.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Controller/Adminhtml/Product/Gallery/UploadTest.php
@@ -167,7 +167,7 @@ public function testUploadActionWithErrors(array $file, array $expectation): voi
         $this->assertEquals($expectation['errorcode'], $jsonBody['errorcode']);
 
         if (!empty($expectation['tmp_media_path'])) {
-            $this->assertFileNotExists(
+            $this->assertFileDoesNotExist(
                 $this->getFileAbsolutePath($expectation['tmp_media_path'])
             );
         }

From ad63c3479cd1874da2804013be6e1583d0f71831 Mon Sep 17 00:00:00 2001
From: "rostyslav.hymon" <rostyslav.hymon@transoftgroup.com>
Date: Mon, 18 May 2020 14:22:43 +0300
Subject: [PATCH 110/120] MC-33879: Paypal checkout Shipping method not
 updating correctly

---
 .../Braintree/Model/Paypal/Helper/ShippingMethodUpdaterTest.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev/tests/integration/testsuite/Magento/Braintree/Model/Paypal/Helper/ShippingMethodUpdaterTest.php b/dev/tests/integration/testsuite/Magento/Braintree/Model/Paypal/Helper/ShippingMethodUpdaterTest.php
index e1f45df26ce1e..f3a038f3438e1 100644
--- a/dev/tests/integration/testsuite/Magento/Braintree/Model/Paypal/Helper/ShippingMethodUpdaterTest.php
+++ b/dev/tests/integration/testsuite/Magento/Braintree/Model/Paypal/Helper/ShippingMethodUpdaterTest.php
@@ -33,7 +33,7 @@ class ShippingMethodUpdaterTest extends TestCase
     /**
      * @inheritdoc
      */
-    protected function setUp()
+    protected function setUp(): void
     {
         $this->objectManager = Bootstrap::getObjectManager();
         $this->shippingMethodUpdater = $this->objectManager->get(ShippingMethodUpdater::class);

From 24736a97694369ceed35302dd5a3d75a1f1d52b5 Mon Sep 17 00:00:00 2001
From: Serhii Balko <serhii.balko@transoftgroup.com>
Date: Mon, 18 May 2020 14:44:44 +0300
Subject: [PATCH 111/120] MC-33147: Stabilise integration tests

---
 .../Magento/Framework/View/LayoutTestWithExceptions.php      | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/dev/tests/integration/testsuite/Magento/Framework/View/LayoutTestWithExceptions.php b/dev/tests/integration/testsuite/Magento/Framework/View/LayoutTestWithExceptions.php
index 7bb71a3d8b6b3..47f22346fbd62 100644
--- a/dev/tests/integration/testsuite/Magento/Framework/View/LayoutTestWithExceptions.php
+++ b/dev/tests/integration/testsuite/Magento/Framework/View/LayoutTestWithExceptions.php
@@ -14,7 +14,10 @@ class LayoutTestWithExceptions extends \PHPUnit\Framework\TestCase
      */
     protected $layout;
 
-    protected function setUp()
+    /**
+     * @inheritdoc
+     */
+    protected function setUp(): void
     {
         $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
         $layoutFactory = $objectManager->get(\Magento\Framework\View\LayoutFactory::class);

From 4c1b02597b8e2254ed75d6a552fcf936dc0f940a Mon Sep 17 00:00:00 2001
From: Vasya Tsviklinskyi <tsviklinskyi@gmail.com>
Date: Tue, 19 May 2020 10:52:16 +0300
Subject: [PATCH 112/120] MC-34363: Admin panel place order with empty CC
 (Braintree) values

---
 app/code/Magento/Braintree/view/adminhtml/web/js/braintree.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/app/code/Magento/Braintree/view/adminhtml/web/js/braintree.js b/app/code/Magento/Braintree/view/adminhtml/web/js/braintree.js
index 393b07fc30403..2bb09c0275900 100644
--- a/app/code/Magento/Braintree/view/adminhtml/web/js/braintree.js
+++ b/app/code/Magento/Braintree/view/adminhtml/web/js/braintree.js
@@ -304,6 +304,9 @@ define([
             }
 
             if (!self.validateCardType()) {
+                $('body').trigger('processStop');
+                self.error($t('Some payment input fields are invalid.'));
+
                 return false;
             }
 

From 0ea42b1e7d703189ef368852e3fd4418c0fb5b42 Mon Sep 17 00:00:00 2001
From: Vasya Tsviklinskyi <tsviklinskyi@gmail.com>
Date: Tue, 19 May 2020 13:38:54 +0300
Subject: [PATCH 113/120] MC-33679: [Cloud] Region name in locale is not
 showing in customer address details.

---
 .../DataProviderWithDefaultAddresses.php      |  37 ++--
 .../ResourceModel/Address/Grid/Collection.php | 170 +++++++++++++++---
 .../Model/ResourceModel/Grid/Collection.php   | 138 +++++++++++++-
 .../DataProviderWithDefaultAddressesTest.php  |  77 +++++---
 .../Listing/Address/DataProvider.php          |  43 ++---
 .../Ui/Component/Listing/FulltextFilter.php   |  34 ++++
 .../Magento/Customer/etc/adminhtml/di.xml     |  18 ++
 app/code/Magento/Customer/etc/indexer.xml     |   1 +
 .../Ui/Component/DataProviderTest.php         |  98 ++++++++++
 .../Listing/Address/DataProviderTest.php      | 116 ++++++++++++
 .../Directory/_files/region_name_jp.php       |  23 +++
 .../_files/region_name_jp_rollback.php        |  16 ++
 12 files changed, 675 insertions(+), 96 deletions(-)
 create mode 100644 app/code/Magento/Customer/Ui/Component/Listing/FulltextFilter.php
 create mode 100644 dev/tests/integration/testsuite/Magento/Customer/Ui/Component/DataProviderTest.php
 create mode 100644 dev/tests/integration/testsuite/Magento/Customer/Ui/Component/Listing/Address/DataProviderTest.php
 create mode 100644 dev/tests/integration/testsuite/Magento/Directory/_files/region_name_jp.php
 create mode 100644 dev/tests/integration/testsuite/Magento/Directory/_files/region_name_jp_rollback.php

diff --git a/app/code/Magento/Customer/Model/Customer/DataProviderWithDefaultAddresses.php b/app/code/Magento/Customer/Model/Customer/DataProviderWithDefaultAddresses.php
index fbf9cf4cbbf9a..604295cc0c078 100644
--- a/app/code/Magento/Customer/Model/Customer/DataProviderWithDefaultAddresses.php
+++ b/app/code/Magento/Customer/Model/Customer/DataProviderWithDefaultAddresses.php
@@ -9,17 +9,20 @@
 use Magento\Customer\Model\Address;
 use Magento\Customer\Model\Customer;
 use Magento\Customer\Model\ResourceModel\Customer\CollectionFactory as CustomerCollectionFactory;
+use Magento\Directory\Model\CountryFactory;
 use Magento\Eav\Model\Config;
 use Magento\Eav\Model\Entity\Attribute\AbstractAttribute;
 use Magento\Eav\Model\Entity\Type;
+use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\Session\SessionManagerInterface;
 use Magento\Customer\Model\FileUploaderDataResolver;
 use Magento\Customer\Model\AttributeMetadataResolver;
+use Magento\Ui\DataProvider\AbstractDataProvider;
 
 /**
  * Refactored version of Magento\Customer\Model\Customer\DataProvider with eliminated usage of addresses collection.
  */
-class DataProviderWithDefaultAddresses extends \Magento\Ui\DataProvider\AbstractDataProvider
+class DataProviderWithDefaultAddresses extends AbstractDataProvider
 {
     /**
      * @var array
@@ -49,7 +52,7 @@ class DataProviderWithDefaultAddresses extends \Magento\Ui\DataProvider\Abstract
     private $allowToShowHiddenAttributes;
 
     /**
-     * @var \Magento\Directory\Model\CountryFactory
+     * @var CountryFactory
      */
     private $countryFactory;
 
@@ -69,14 +72,14 @@ class DataProviderWithDefaultAddresses extends \Magento\Ui\DataProvider\Abstract
      * @param string $requestFieldName
      * @param CustomerCollectionFactory $customerCollectionFactory
      * @param Config $eavConfig
-     * @param \Magento\Directory\Model\CountryFactory $countryFactory
+     * @param CountryFactory $countryFactory
      * @param SessionManagerInterface $session
      * @param FileUploaderDataResolver $fileUploaderDataResolver
      * @param AttributeMetadataResolver $attributeMetadataResolver
      * @param bool $allowToShowHiddenAttributes
      * @param array $meta
      * @param array $data
-     * @throws \Magento\Framework\Exception\LocalizedException
+     * @throws LocalizedException
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
@@ -85,7 +88,7 @@ public function __construct(
         string $requestFieldName,
         CustomerCollectionFactory $customerCollectionFactory,
         Config $eavConfig,
-        \Magento\Directory\Model\CountryFactory $countryFactory,
+        CountryFactory $countryFactory,
         SessionManagerInterface $session,
         FileUploaderDataResolver $fileUploaderDataResolver,
         AttributeMetadataResolver $attributeMetadataResolver,
@@ -158,17 +161,21 @@ public function getData(): array
      */
     private function prepareDefaultAddress($address): array
     {
-        $addressData = [];
-
-        if (!empty($address)) {
-            $addressData = $address->getData();
-            if (isset($addressData['street']) && !\is_array($address['street'])) {
-                $addressData['street'] = explode("\n", $addressData['street']);
-            }
-            $countryId = $addressData['country_id'] ?? null;
-            $addressData['country'] = $this->countryFactory->create()->loadByCode($countryId)->getName();
+        if (!$address) {
+            return [];
         }
 
+        $addressData = $address->getData();
+        if (isset($addressData['street']) && !is_array($addressData['street'])) {
+            $addressData['street'] = explode("\n", $addressData['street']);
+        }
+        if (!empty($addressData['country_id'])) {
+            $addressData['country'] = $this->countryFactory->create()
+                ->loadByCode($addressData['country_id'])
+                ->getName();
+        }
+        $addressData['region'] = $address->getRegion();
+
         return $addressData;
     }
 
@@ -177,7 +184,7 @@ private function prepareDefaultAddress($address): array
      *
      * @param Type $entityType
      * @return array
-     * @throws \Magento\Framework\Exception\LocalizedException
+     * @throws LocalizedException
      */
     private function getAttributesMeta(Type $entityType): array
     {
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 4e0347059086f..37dec6dc29944 100644
--- a/app/code/Magento/Customer/Model/ResourceModel/Address/Grid/Collection.php
+++ b/app/code/Magento/Customer/Model/ResourceModel/Address/Grid/Collection.php
@@ -6,53 +6,84 @@
  */
 namespace Magento\Customer\Model\ResourceModel\Address\Grid;
 
+use Magento\Framework\Api\ExtensibleDataInterface;
 use Magento\Framework\Api\Search\SearchResultInterface;
 use Magento\Framework\Api\Search\AggregationInterface;
+use Magento\Framework\Api\SearchCriteriaInterface;
+use Magento\Framework\Data\Collection\Db\FetchStrategyInterface;
+use Magento\Framework\Data\Collection\EntityFactoryInterface;
+use Magento\Framework\DB\Adapter\AdapterInterface;
+use Magento\Framework\Event\ManagerInterface;
+use Magento\Framework\Locale\ResolverInterface;
+use Magento\Framework\Model\ResourceModel\Db\AbstractDb;
 use Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection;
+use Magento\Framework\View\Element\UiComponent\DataProvider\Document;
+use Psr\Log\LoggerInterface;
 
 /**
  * Class getting collection of addresses assigned to customer
  */
 class Collection extends AbstractCollection implements SearchResultInterface
 {
+    /**
+     * List of fields to fulltext search
+     */
+    private const FIELDS_TO_FULLTEXT_SEARCH = [
+        'firstname',
+        'lastname',
+        'street',
+        'city',
+        'region',
+        'postcode',
+        'telephone',
+    ];
+
     /**
      * @var AggregationInterface
      */
     private $aggregations;
 
     /**
-     * @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
+     * @var ResolverInterface
+     */
+    private $localeResolver;
+
+    /**
+     * @param EntityFactoryInterface $entityFactory
+     * @param LoggerInterface $logger
+     * @param FetchStrategyInterface $fetchStrategy
+     * @param ManagerInterface $eventManager
      * @param string $mainTable
      * @param string $eventPrefix
      * @param string $eventObject
      * @param string $resourceModel
+     * @param ResolverInterface $localeResolver
      * @param string $model
-     * @param \Magento\Framework\DB\Adapter\AdapterInterface|string|null $connection
-     * @param \Magento\Framework\Model\ResourceModel\Db\AbstractDb $resource
+     * @param AdapterInterface|string|null $connection
+     * @param AbstractDb $resource
      *
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     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,
+        EntityFactoryInterface $entityFactory,
+        LoggerInterface $logger,
+        FetchStrategyInterface $fetchStrategy,
+        ManagerInterface $eventManager,
         $mainTable,
         $eventPrefix,
         $eventObject,
         $resourceModel,
-        $model = \Magento\Framework\View\Element\UiComponent\DataProvider\Document::class,
+        ResolverInterface $localeResolver,
+        $model = Document::class,
         $connection = null,
-        \Magento\Framework\Model\ResourceModel\Db\AbstractDb $resource = null
+        AbstractDb $resource = null
     ) {
         $this->_eventPrefix = $eventPrefix;
         $this->_eventObject = $eventObject;
+        $this->_idFieldName = 'entity_id';
+        $this->localeResolver = $localeResolver;
         $this->_init($model, $resourceModel);
         $this->setMainTable($mainTable);
-        $this->_idFieldName = 'entity_id';
         parent::__construct(
             $entityFactory,
             $logger,
@@ -65,8 +96,17 @@ public function __construct(
 
     /**
      * @inheritdoc
-     *
-     * @return AggregationInterface
+     */
+    protected function _initSelect()
+    {
+        parent::_initSelect();
+        $this->joinRegionNameTable();
+
+        return $this;
+    }
+
+    /**
+     * @inheritdoc
      */
     public function getAggregations()
     {
@@ -75,9 +115,6 @@ public function getAggregations()
 
     /**
      * @inheritdoc
-     *
-     * @param AggregationInterface $aggregations
-     * @return $this
      */
     public function setAggregations($aggregations)
     {
@@ -88,7 +125,7 @@ public function setAggregations($aggregations)
     /**
      * Get search criteria.
      *
-     * @return \Magento\Framework\Api\SearchCriteriaInterface|null
+     * @return SearchCriteriaInterface|null
      */
     public function getSearchCriteria()
     {
@@ -98,11 +135,11 @@ public function getSearchCriteria()
     /**
      * Set search criteria.
      *
-     * @param \Magento\Framework\Api\SearchCriteriaInterface $searchCriteria
+     * @param SearchCriteriaInterface $searchCriteria
      * @return $this
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
-    public function setSearchCriteria(\Magento\Framework\Api\SearchCriteriaInterface $searchCriteria = null)
+    public function setSearchCriteria(SearchCriteriaInterface $searchCriteria = null)
     {
         return $this;
     }
@@ -132,7 +169,7 @@ public function setTotalCount($totalCount)
     /**
      * Set items list.
      *
-     * @param \Magento\Framework\Api\ExtensibleDataInterface[] $items
+     * @param ExtensibleDataInterface[] $items
      * @return $this
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
@@ -140,4 +177,93 @@ public function setItems(array $items = null)
     {
         return $this;
     }
+
+    /**
+     * @inheritdoc
+     */
+    public function addFieldToFilter($field, $condition = null)
+    {
+        if ($field === 'region') {
+            $conditionSql = $this->_getConditionSql(
+                $this->getRegionNameExpresion(),
+                $condition
+            );
+            $this->getSelect()->where($conditionSql);
+            return $this;
+        }
+
+        return parent::addFieldToFilter('main_table.' . $field, $condition);
+    }
+
+    /**
+     * Add fulltext filter
+     *
+     * @param string $value
+     * @return $this
+     */
+    public function addFullTextFilter(string $value)
+    {
+        $fields = self::FIELDS_TO_FULLTEXT_SEARCH;
+        $whereCondition = '';
+        foreach ($fields as $key => $field) {
+            $field = $field === 'region'
+                ? $this->getRegionNameExpresion()
+                : 'main_table.' . $field;
+            $condition = $this->_getConditionSql(
+                $this->getConnection()->quoteIdentifier($field),
+                ['like' => "%$value%"]
+            );
+            $whereCondition .= ($key === 0 ? '' : ' OR ') . $condition;
+        }
+        if ($whereCondition) {
+            $this->getSelect()->where($whereCondition);
+        }
+
+        return $this;
+    }
+
+    /**
+     * Join region name table by current locale
+     *
+     * @return $this
+     */
+    private function joinRegionNameTable()
+    {
+        $locale = $this->localeResolver->getLocale();
+        $connection = $this->getConnection();
+        $regionIdField = $connection->quoteIdentifier('main_table.region_id');
+        $localeCondition = $connection->quoteInto("rnt.locale=?", $locale);
+
+        $this->getSelect()
+            ->joinLeft(
+                ['rct' => $this->getTable('directory_country_region')],
+                "rct.region_id={$regionIdField}",
+                []
+            )->joinLeft(
+                ['rnt' => $this->getTable('directory_country_region_name')],
+                "rnt.region_id={$regionIdField} AND {$localeCondition}",
+                ['region' => $this->getRegionNameExpresion()]
+            );
+
+        return $this;
+    }
+
+    /**
+     * Get SQL Expresion to define Region Name field by locale
+     *
+     * @return \Zend_Db_Expr
+     */
+    private function getRegionNameExpresion(): \Zend_Db_Expr
+    {
+        $connection = $this->getConnection();
+        $defaultNameExpr = $connection->getIfNullSql(
+            $connection->quoteIdentifier('rct.default_name'),
+            $connection->quoteIdentifier('main_table.region')
+        );
+
+        return $connection->getIfNullSql(
+            $connection->quoteIdentifier('rnt.name'),
+            $defaultNameExpr
+        );
+    }
 }
diff --git a/app/code/Magento/Customer/Model/ResourceModel/Grid/Collection.php b/app/code/Magento/Customer/Model/ResourceModel/Grid/Collection.php
index 15678bd3dfd3f..2ee3a30ba7991 100644
--- a/app/code/Magento/Customer/Model/ResourceModel/Grid/Collection.php
+++ b/app/code/Magento/Customer/Model/ResourceModel/Grid/Collection.php
@@ -3,17 +3,27 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
 namespace Magento\Customer\Model\ResourceModel\Grid;
 
+use Magento\Customer\Model\ResourceModel\Customer;
 use Magento\Customer\Ui\Component\DataProvider\Document;
 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\Locale\ResolverInterface;
+use Magento\Framework\View\Element\UiComponent\DataProvider\SearchResult;
 use Psr\Log\LoggerInterface as Logger;
 
-class Collection extends \Magento\Framework\View\Element\UiComponent\DataProvider\SearchResult
+/**
+ * Collection to present grid of customers on admin area
+ */
+class Collection extends SearchResult
 {
+    /**
+     * @var ResolverInterface
+     */
+    private $localeResolver;
+
     /**
      * @inheritdoc
      */
@@ -25,12 +35,11 @@ class Collection extends \Magento\Framework\View\Element\UiComponent\DataProvide
     protected $_map = ['fields' => ['entity_id' => 'main_table.entity_id']];
 
     /**
-     * Initialize dependencies.
-     *
      * @param EntityFactory $entityFactory
      * @param Logger $logger
      * @param FetchStrategy $fetchStrategy
      * @param EventManager $eventManager
+     * @param ResolverInterface $localeResolver
      * @param string $mainTable
      * @param string $resourceModel
      */
@@ -39,9 +48,128 @@ public function __construct(
         Logger $logger,
         FetchStrategy $fetchStrategy,
         EventManager $eventManager,
+        ResolverInterface $localeResolver,
         $mainTable = 'customer_grid_flat',
-        $resourceModel = \Magento\Customer\Model\ResourceModel\Customer::class
+        $resourceModel = Customer::class
     ) {
+        $this->localeResolver = $localeResolver;
         parent::__construct($entityFactory, $logger, $fetchStrategy, $eventManager, $mainTable, $resourceModel);
     }
+
+    /**
+     * @inheritdoc
+     */
+    protected function _initSelect()
+    {
+        parent::_initSelect();
+        $this->joinRegionNameTable();
+
+        return $this;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function addFieldToFilter($field, $condition = null)
+    {
+        if ($field === 'billing_region') {
+            $conditionSql = $this->_getConditionSql(
+                $this->getRegionNameExpresion(),
+                $condition
+            );
+            $this->getSelect()->where($conditionSql);
+            return $this;
+        }
+
+        return parent::addFieldToFilter('main_table.' . $field, $condition);
+    }
+
+    /**
+     * Add fulltext filter
+     *
+     * @param string $value
+     * @return $this
+     */
+    public function addFullTextFilter(string $value)
+    {
+        $fields = $this->getFulltextIndexColumns();
+        $whereCondition = '';
+        foreach ($fields as $key => $field) {
+            $field = $field === 'billing_region'
+                ? $this->getRegionNameExpresion()
+                : 'main_table.' . $field;
+            $condition = $this->_getConditionSql(
+                $this->getConnection()->quoteIdentifier($field),
+                ['like' => "%$value%"]
+            );
+            $whereCondition .= ($key === 0 ? '' : ' OR ') . $condition;
+        }
+
+        if ($whereCondition) {
+            $this->getSelect()->where($whereCondition);
+        }
+
+        return $this;
+    }
+
+    /**
+     * Returns list of columns from fulltext index
+     *
+     * @return array
+     */
+    private function getFulltextIndexColumns(): array
+    {
+        $indexes = $this->getConnection()->getIndexList($this->getMainTable());
+        foreach ($indexes as $index) {
+            if (strtoupper($index['INDEX_TYPE']) == 'FULLTEXT') {
+                return $index['COLUMNS_LIST'];
+            }
+        }
+        return [];
+    }
+
+    /**
+     * Join region name table by current locale
+     *
+     * @return $this
+     */
+    private function joinRegionNameTable()
+    {
+        $locale = $this->localeResolver->getLocale();
+        $connection = $this->getConnection();
+        $regionIdField = $connection->quoteIdentifier('main_table.billing_region_id');
+        $localeCondition = $connection->quoteInto("rnt.locale=?", $locale);
+
+        $this->getSelect()
+            ->joinLeft(
+                ['rct' => $this->getTable('directory_country_region')],
+                "rct.region_id={$regionIdField}",
+                []
+            )->joinLeft(
+                ['rnt' => $this->getTable('directory_country_region_name')],
+                "rnt.region_id={$regionIdField} AND {$localeCondition}",
+                ['billing_region' => $this->getRegionNameExpresion()]
+            );
+
+        return $this;
+    }
+
+    /**
+     * Get SQL Expresion to define Region Name field by locale
+     *
+     * @return \Zend_Db_Expr
+     */
+    private function getRegionNameExpresion(): \Zend_Db_Expr
+    {
+        $connection = $this->getConnection();
+        $defaultNameExpr = $connection->getIfNullSql(
+            $connection->quoteIdentifier('rct.default_name'),
+            $connection->quoteIdentifier('main_table.billing_region')
+        );
+
+        return $connection->getIfNullSql(
+            $connection->quoteIdentifier('rnt.name'),
+            $defaultNameExpr
+        );
+    }
 }
diff --git a/app/code/Magento/Customer/Test/Unit/Model/Customer/DataProviderWithDefaultAddressesTest.php b/app/code/Magento/Customer/Test/Unit/Model/Customer/DataProviderWithDefaultAddressesTest.php
index 0cb135ee66a12..fbeefb26efedb 100644
--- a/app/code/Magento/Customer/Test/Unit/Model/Customer/DataProviderWithDefaultAddressesTest.php
+++ b/app/code/Magento/Customer/Test/Unit/Model/Customer/DataProviderWithDefaultAddressesTest.php
@@ -1,5 +1,4 @@
 <?php
-
 /**
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
@@ -75,13 +74,17 @@ class DataProviderWithDefaultAddressesTest extends TestCase
     private $attributeMetadataResolver;
 
     /**
-     * @return void
+     * @var DataProviderWithDefaultAddresses
+     */
+    private $dataProvider;
+
+    /**
+     * @inheritdoc
+     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
      */
     protected function setUp(): void
     {
-        $this->eavConfigMock = $this->getMockBuilder(Config::class)
-            ->disableOriginalConstructor()
-            ->getMock();
+        $this->eavConfigMock = $this->getMockBuilder(Config::class)->disableOriginalConstructor()->getMock();
         $this->customerCollectionFactoryMock = $this->createPartialMock(CustomerCollectionFactory::class, ['create']);
         $this->sessionMock = $this->getMockBuilder(SessionManagerInterface::class)
             ->setMethods(['getCustomerFormData', 'unsCustomerFormData'])
@@ -161,20 +164,21 @@ protected function setUp(): void
                     ],
                 ]
             );
+
         $helper = new ObjectManager($this);
         $this->dataProvider = $helper->getObject(
             DataProviderWithDefaultAddresses::class,
             [
-                'name'                      => 'test-name',
-                'primaryFieldName'          => 'primary-field-name',
-                'requestFieldName'          => 'request-field-name',
+                'name' => 'test-name',
+                'primaryFieldName' => 'primary-field-name',
+                'requestFieldName' => 'request-field-name',
                 'customerCollectionFactory' => $this->customerCollectionFactoryMock,
-                'eavConfig'                 => $this->eavConfigMock,
-                'countryFactory'            => $this->countryFactoryMock,
-                'session'                   => $this->sessionMock,
-                'fileUploaderDataResolver'  => $this->fileUploaderDataResolver,
+                'eavConfig' => $this->eavConfigMock,
+                'countryFactory' => $this->countryFactoryMock,
+                'session' => $this->sessionMock,
+                'fileUploaderDataResolver' => $this->fileUploaderDataResolver,
                 'attributeMetadataResolver' => $this->attributeMetadataResolver,
-                true
+                'allowToShowHiddenAttributes' => true,
             ]
         );
     }
@@ -343,6 +347,7 @@ protected function getAttributeMock($options = []): array
      */
     public function testGetData(): void
     {
+        $customerId = 1;
         $customerData = [
             'email' => 'test@test.ua',
             'default_billing' => 2,
@@ -350,18 +355,35 @@ public function testGetData(): void
             'password_hash' => 'password_hash',
             'rp_token' => 'rp_token',
         ];
+        $addressData = [
+            'country_id' => 'code',
+            'entity_id' => 2,
+            'parent_id' => $customerId,
+            'street' => "line 1\nline 2",
+            'region' => 'Region Name',
+        ];
+        $localeRegionName = 'Locale Region Name';
 
-        $address = $this->getMockBuilder(Address::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-        $this->customerCollectionMock->expects($this->once())->method('getItems')->willReturn([$this->customerMock]);
-        $this->customerMock->expects($this->once())->method('getData')->willReturn($customerData);
-        $this->customerMock->expects($this->atLeastOnce())->method('getId')->willReturn(1);
+        $address = $this->createMock(Address::class);
+        $address->method('getData')->willReturn($addressData);
+        $address->method('getRegion')->willReturn($localeRegionName);
+
+        $this->customerCollectionMock->method('getItems')->willReturn([$this->customerMock]);
+        $this->customerMock->method('getDefaultBillingAddress')->willReturn($address);
+        $this->customerMock->method('getDefaultShippingAddress')->willReturn(false);
+        $this->customerMock->method('getData')->willReturn($customerData);
+        $this->customerMock->method('getId')->willReturn($customerId);
 
-        $this->customerMock->expects($this->once())->method('getDefaultBillingAddress')->willReturn($address);
-        $this->countryFactoryMock->expects($this->once())->method('create')->willReturnSelf();
-        $this->countryFactoryMock->expects($this->once())->method('loadByCode')->willReturnSelf();
-        $this->countryFactoryMock->expects($this->once())->method('getName')->willReturn('Ukraine');
+        $this->countryFactoryMock->expects($this->once())
+            ->method('create')
+            ->willReturnSelf();
+        $this->countryFactoryMock->expects($this->once())
+            ->method('loadByCode')
+            ->with('code')
+            ->willReturnSelf();
+        $this->countryFactoryMock->expects($this->once())
+            ->method('getName')
+            ->willReturn('Ukraine');
 
         $this->sessionMock->expects($this->once())
             ->method('getCustomerFormData')
@@ -369,7 +391,7 @@ public function testGetData(): void
 
         $this->assertEquals(
             [
-                1 => [
+                $customerId => [
                     'customer' => [
                         'email' => 'test@test.ua',
                         'default_billing' => 2,
@@ -377,9 +399,14 @@ public function testGetData(): void
                     ],
                     'default_billing_address' => [
                         'country' => 'Ukraine',
+                        'country_id' => 'code',
+                        'entity_id' => 2,
+                        'parent_id' => $customerId,
+                        'street' => ['line 1', 'line 2'],
+                        'region' => $localeRegionName,
                     ],
                     'default_shipping_address' => [],
-                    'customer_id' => 1
+                    'customer_id' => $customerId
                 ]
             ],
             $this->dataProvider->getData()
diff --git a/app/code/Magento/Customer/Ui/Component/Listing/Address/DataProvider.php b/app/code/Magento/Customer/Ui/Component/Listing/Address/DataProvider.php
index c70e25ee99ec3..e26a32ec15c62 100644
--- a/app/code/Magento/Customer/Ui/Component/Listing/Address/DataProvider.php
+++ b/app/code/Magento/Customer/Ui/Component/Listing/Address/DataProvider.php
@@ -5,17 +5,20 @@
  */
 namespace Magento\Customer\Ui\Component\Listing\Address;
 
+use Magento\Customer\Model\ResourceModel\Address\Grid\Collection as GridCollection;
 use Magento\Customer\Model\ResourceModel\Address\Grid\CollectionFactory;
 use Magento\Directory\Model\CountryFactory;
 use Magento\Framework\Api\Filter;
+use Magento\Framework\App\RequestInterface;
+use Magento\Ui\DataProvider\AbstractDataProvider;
 
 /**
  * Custom DataProvider for customer addresses listing
  */
-class DataProvider extends \Magento\Ui\DataProvider\AbstractDataProvider
+class DataProvider extends AbstractDataProvider
 {
     /**
-     * @var \Magento\Framework\App\RequestInterface $request,
+     * @var RequestInterface $request,
      */
     private $request;
 
@@ -29,7 +32,7 @@ class DataProvider extends \Magento\Ui\DataProvider\AbstractDataProvider
      * @param string $primaryFieldName
      * @param string $requestFieldName
      * @param CollectionFactory $collectionFactory
-     * @param \Magento\Framework\App\RequestInterface $request
+     * @param RequestInterface $request
      * @param CountryFactory $countryFactory
      * @param array $meta
      * @param array $data
@@ -39,7 +42,7 @@ public function __construct(
         $primaryFieldName,
         $requestFieldName,
         CollectionFactory $collectionFactory,
-        \Magento\Framework\App\RequestInterface $request,
+        RequestInterface $request,
         CountryFactory $countryFactory,
         array $meta = [],
         array $data = []
@@ -57,6 +60,7 @@ public function __construct(
      */
     public function getData(): array
     {
+        /** @var GridCollection $collection */
         $collection = $this->getCollection();
         $data['items'] = [];
         if ($this->request->getParam('parent_id')) {
@@ -80,34 +84,15 @@ public function getData(): array
      */
     public function addFilter(Filter $filter): void
     {
-        if ($filter->getField() !== 'fulltext') {
-            $this->collection->addFieldToFilter(
+        /** @var GridCollection $collection */
+        $collection = $this->getCollection();
+        if ($filter->getField() === 'fulltext') {
+            $collection->addFullTextFilter(trim($filter->getValue()));
+        } else {
+            $collection->addFieldToFilter(
                 $filter->getField(),
                 [$filter->getConditionType() => $filter->getValue()]
             );
-        } else {
-            $value = trim($filter->getValue());
-            $this->collection->addFieldToFilter(
-                [
-                    ['attribute' => 'firstname'],
-                    ['attribute' => 'lastname'],
-                    ['attribute' => 'street'],
-                    ['attribute' => 'city'],
-                    ['attribute' => 'region'],
-                    ['attribute' => 'postcode'],
-                    ['attribute' => 'telephone']
-                ],
-                [
-                    ['like' => "%{$value}%"],
-                    ['like' => "%{$value}%"],
-                    ['like' => "%{$value}%"],
-                    ['like' => "%{$value}%"],
-                    ['like' => "%{$value}%"],
-                    ['like' => "%{$value}%"],
-                    ['like' => "%{$value}%"],
-                    ['like' => "%{$value}%"],
-                ]
-            );
         }
     }
 }
diff --git a/app/code/Magento/Customer/Ui/Component/Listing/FulltextFilter.php b/app/code/Magento/Customer/Ui/Component/Listing/FulltextFilter.php
new file mode 100644
index 0000000000000..b6821e002f645
--- /dev/null
+++ b/app/code/Magento/Customer/Ui/Component/Listing/FulltextFilter.php
@@ -0,0 +1,34 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Customer\Ui\Component\Listing;
+
+use Magento\Customer\Model\ResourceModel\Grid\Collection as GridCollection;
+use Magento\Framework\Api\Filter;
+use Magento\Framework\Data\Collection;
+use Magento\Framework\Data\Collection\AbstractDb;
+use Magento\Framework\View\Element\UiComponent\DataProvider\FilterApplierInterface;
+
+/**
+ * Full text filter for customer listing data source
+ */
+class FulltextFilter implements FilterApplierInterface
+{
+    /**
+     * @inheritdoc
+     */
+    public function apply(Collection $collection, Filter $filter)
+    {
+        if (!$collection instanceof AbstractDb) {
+            throw new \InvalidArgumentException('Database collection required.');
+        }
+
+        /** @var GridCollection $gridCollection */
+        $gridCollection = $collection;
+        $gridCollection->addFullTextFilter(trim($filter->getValue()));
+    }
+}
diff --git a/app/code/Magento/Customer/etc/adminhtml/di.xml b/app/code/Magento/Customer/etc/adminhtml/di.xml
index 575fd639fa539..9f207ea8bebd1 100644
--- a/app/code/Magento/Customer/etc/adminhtml/di.xml
+++ b/app/code/Magento/Customer/etc/adminhtml/di.xml
@@ -23,4 +23,22 @@
             </argument>
         </arguments>
     </type>
+    <virtualType name="CustomerGirdFilterPool" type="Magento\Framework\View\Element\UiComponent\DataProvider\FilterPool">
+        <arguments>
+            <argument name="appliers" xsi:type="array">
+                <item name="regular" xsi:type="object">Magento\Framework\View\Element\UiComponent\DataProvider\RegularFilter</item>
+                <item name="fulltext" xsi:type="object">Magento\Customer\Ui\Component\Listing\FulltextFilter</item>
+            </argument>
+        </arguments>
+    </virtualType>
+    <virtualType name="CustomerGridCollectionReporting" type="Magento\Framework\View\Element\UiComponent\DataProvider\Reporting">
+        <arguments>
+            <argument name="filterPool" xsi:type="object">CustomerGirdFilterPool</argument>
+        </arguments>
+    </virtualType>
+    <type name="Magento\Customer\Ui\Component\DataProvider">
+        <arguments>
+            <argument name="reporting" xsi:type="object">CustomerGridCollectionReporting</argument>
+        </arguments>
+    </type>
 </config>
diff --git a/app/code/Magento/Customer/etc/indexer.xml b/app/code/Magento/Customer/etc/indexer.xml
index fdc0ab0eb16f6..cd3b41471a3bb 100644
--- a/app/code/Magento/Customer/etc/indexer.xml
+++ b/app/code/Magento/Customer/etc/indexer.xml
@@ -41,6 +41,7 @@
             <field name="postcode" xsi:type="searchable" dataType="varchar"/>
             <field name="country_id" xsi:type="filterable" dataType="varchar"/>
             <field name="region" xsi:type="searchable" dataType="varchar"/>
+            <field name="region_id" xsi:type="filterable" dataType="int"/>
             <field name="street" xsi:type="searchable" dataType="varchar"/>
             <field name="city" xsi:type="searchable" dataType="varchar"/>
             <field name="fax" xsi:type="searchable" dataType="varchar"/>
diff --git a/dev/tests/integration/testsuite/Magento/Customer/Ui/Component/DataProviderTest.php b/dev/tests/integration/testsuite/Magento/Customer/Ui/Component/DataProviderTest.php
new file mode 100644
index 0000000000000..09176697a06d9
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Customer/Ui/Component/DataProviderTest.php
@@ -0,0 +1,98 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Customer\Ui\Component;
+
+use Magento\Backend\Model\Locale\Resolver;
+use Magento\Framework\Api\Filter;
+use Magento\Framework\Locale\ResolverInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+use PHPUnit\Framework\MockObject\MockObject;
+use PHPUnit\Framework\TestCase;
+
+/**
+ * Class to test Data Provider for customer listing
+ *
+ * @magentoAppArea adminhtml
+ */
+class DataProviderTest extends TestCase
+{
+    /**
+     * @var ResolverInterface|MockObject
+     */
+    private $localeResolverMock;
+
+    /**
+     * @var DataProvider
+     */
+    private $dataProvider;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        $this->initLocaleResolverMock();
+    }
+
+    /**
+     * Test to filter by region name in custom locale
+     *
+     * @param array $filterData
+     * @magentoDataFixture Magento/Customer/_files/customer.php
+     * @magentoDataFixture Magento/Customer/_files/customer_address.php
+     * @magentoDataFixture Magento/Directory/_files/region_name_jp.php
+     * @dataProvider getDataByRegionDataProvider
+     * @magentoDbIsolation disabled
+     */
+    public function testGetDataByRegion(array $filterData)
+    {
+        $locale = 'JA_jp';
+        $this->localeResolverMock->method('getLocale')->willReturn($locale);
+        $this->dataProvider = Bootstrap::getObjectManager()->create(
+            DataProvider::class,
+            [
+                'name' => 'customer_listing_data_source',
+                'requestFieldName' => 'id',
+                'primaryFieldName' => 'entity_id',
+            ]
+        );
+
+        $filter = Bootstrap::getObjectManager()->create(
+            Filter::class,
+            ['data' => $filterData]
+        );
+        $this->dataProvider->addFilter($filter);
+        $data = $this->dataProvider->getData();
+        $this->assertEquals(1, $data['totalRecords']);
+        $this->assertCount(1, $data['items']);
+        $this->assertEquals($filterData['value'], $data['items'][0]['billing_region']);
+    }
+
+    /**
+     * @return array
+     */
+    public function getDataByRegionDataProvider(): array
+    {
+        return [
+            [['condition_type' => 'fulltext', 'field' => 'fulltext', 'value' => 'アラバマ']],
+            [['condition_type' => 'regular', 'field' => 'billing_region', 'value' => 'アラバマ']],
+        ];
+    }
+
+    /**
+     * Mock locale resolver
+     */
+    private function initLocaleResolverMock(): 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);
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Customer/Ui/Component/Listing/Address/DataProviderTest.php b/dev/tests/integration/testsuite/Magento/Customer/Ui/Component/Listing/Address/DataProviderTest.php
new file mode 100644
index 0000000000000..249c48fc826ec
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Customer/Ui/Component/Listing/Address/DataProviderTest.php
@@ -0,0 +1,116 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Customer\Ui\Component\Listing\Address;
+
+use Magento\Backend\Model\Locale\Resolver;
+use Magento\Framework\Api\Filter;
+use Magento\Framework\App\RequestInterface;
+use Magento\Framework\Locale\ResolverInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+use PHPUnit\Framework\MockObject\MockObject;
+use PHPUnit\Framework\TestCase;
+
+/**
+ * Class to test Data Provider for customer address listing
+ *
+ * @magentoAppArea adminhtml
+ */
+class DataProviderTest extends TestCase
+{
+    /**
+     * @var ResolverInterface|MockObject
+     */
+    private $localeResolverMock;
+
+    /**
+     * @var RequestInterface|MockObject
+     */
+    private $requestMock;
+
+    /**
+     * @var DataProvider
+     */
+    private $dataProvider;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        $this->initLocaleResolverMock();
+        $this->requestMock = $this->createMock(RequestInterface::class);
+        $this->dataProvider = Bootstrap::getObjectManager()->create(
+            DataProvider::class,
+            [
+                'name' => 'customer_address_listing_data_source',
+                'requestFieldName' => 'id',
+                'primaryFieldName' => 'entity_id',
+                'request' => $this->requestMock,
+            ]
+        );
+    }
+
+    /**
+     * Test to filter by region name in custom locale
+     *
+     * @param array $filterData
+     * @magentoDataFixture Magento/Customer/_files/customer.php
+     * @magentoDataFixture Magento/Customer/_files/customer_address.php
+     * @magentoDataFixture Magento/Directory/_files/region_name_jp.php
+     * @dataProvider getDataByRegionDataProvider
+     */
+    public function testGetDataByRegion(array $filterData)
+    {
+        $customerId = 1;
+        $locale = 'JA_jp';
+        $this->localeResolverMock->method('getLocale')->willReturn($locale);
+        $this->requestMock->method('getParam')->with('parent_id')->willReturn($customerId);
+        $this->dataProvider = Bootstrap::getObjectManager()->create(
+            DataProvider::class,
+            [
+                'name' => 'customer_address_listing_data_source',
+                'requestFieldName' => 'id',
+                'primaryFieldName' => 'entity_id',
+                'request' => $this->requestMock,
+            ]
+        );
+
+        $filter = Bootstrap::getObjectManager()->create(
+            Filter::class,
+            ['data' => $filterData]
+        );
+        $this->dataProvider->addFilter($filter);
+        $data = $this->dataProvider->getData();
+        $this->assertEquals(1, $data['totalRecords']);
+        $this->assertCount(1, $data['items']);
+        $this->assertEquals($filterData['value'], $data['items'][0]['region']);
+    }
+
+    /**
+     * @return array
+     */
+    public function getDataByRegionDataProvider(): array
+    {
+        return [
+            [['condition_type' => 'fulltext', 'field' => 'fulltext', 'value' => 'アラバマ']],
+            [['condition_type' => 'regular', 'field' => 'region', 'value' => 'アラバマ']],
+        ];
+    }
+
+    /**
+     * Mock locale resolver
+     */
+    private function initLocaleResolverMock()
+    {
+        $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);
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Directory/_files/region_name_jp.php b/dev/tests/integration/testsuite/Magento/Directory/_files/region_name_jp.php
new file mode 100644
index 0000000000000..9d6c952fddff3
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Directory/_files/region_name_jp.php
@@ -0,0 +1,23 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\Framework\App\ResourceConnection;
+use Magento\TestFramework\Helper\Bootstrap;
+
+/** @var ResourceConnection $resource */
+$resource = Bootstrap::getObjectManager()->get(ResourceConnection::class);
+$connection = $resource->getConnection();
+/** Add japan name of Alabama State */
+$alabamaOnJP = [
+    'locale' => 'JA_jp',
+    'region_id' => 1,
+    'name' => 'アラバマ'
+];
+$connection->insert(
+    $resource->getTableName('directory_country_region_name'),
+    $alabamaOnJP
+);
diff --git a/dev/tests/integration/testsuite/Magento/Directory/_files/region_name_jp_rollback.php b/dev/tests/integration/testsuite/Magento/Directory/_files/region_name_jp_rollback.php
new file mode 100644
index 0000000000000..2a565dc52258f
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Directory/_files/region_name_jp_rollback.php
@@ -0,0 +1,16 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\Framework\App\ResourceConnection;
+use Magento\TestFramework\Helper\Bootstrap;
+
+/** @var ResourceConnection $resource */
+$resource = Bootstrap::getObjectManager()->get(ResourceConnection::class);
+$resource->getConnection()->delete(
+    $resource->getTableName('directory_country_region_name'),
+    "locale='JA_jp'"
+);

From 44131f8bc2fed8534995da0e43bfd2310fe78ff8 Mon Sep 17 00:00:00 2001
From: engcom-Echo <engcom-vendorworker-echo@adobe.com>
Date: Tue, 19 May 2020 14:30:25 +0300
Subject: [PATCH 114/120] Added MFTF - created orders on storefront with 'Move
 JS code bottom' enable

---
 .../AdminCreateSimpleProductActionGroup.xml   |  39 +++++++
 .../Test/Mftf/Data/DeveloperConfigData.xml    |  22 ++++
 ...ntCreateOrdersWithMoveJSCodeBottomTest.xml | 100 ++++++++++++++++++
 3 files changed, 161 insertions(+)
 create mode 100644 app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminCreateSimpleProductActionGroup.xml
 create mode 100644 app/code/Magento/Sales/Test/Mftf/Data/DeveloperConfigData.xml
 create mode 100644 app/code/Magento/Sales/Test/Mftf/Test/StorefrontCreateOrdersWithMoveJSCodeBottomTest.xml

diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminCreateSimpleProductActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminCreateSimpleProductActionGroup.xml
new file mode 100644
index 0000000000000..b1ad890c121d3
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminCreateSimpleProductActionGroup.xml
@@ -0,0 +1,39 @@
+<?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="AdminCreateSimpleProductActionGroup">
+        <annotations>
+            <description>Goes to the Admin Product grid page. Clicks on Add. Fills the provided Product details (Name, SKU, Price, Quantity, Category and URL). Clicks on Save. Validates that the Product details are present and correct.</description>
+        </annotations>
+        <arguments>
+            <argument name="category"/>
+            <argument name="simpleProduct"/>
+        </arguments>
+
+        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="navigateToProductIndex"/>
+        <click selector="{{AdminProductGridActionSection.addProductToggle}}" stepKey="clickAddProductDropdown"/>
+        <click selector="{{AdminProductGridActionSection.addSimpleProduct}}" stepKey="clickAddSimpleProduct"/>
+        <fillField userInput="{{simpleProduct.name}}" selector="{{AdminProductFormSection.productName}}" stepKey="fillName"/>
+        <fillField userInput="{{simpleProduct.sku}}" selector="{{AdminProductFormSection.productSku}}" stepKey="fillSKU"/>
+        <fillField userInput="{{simpleProduct.price}}" selector="{{AdminProductFormSection.productPrice}}" stepKey="fillPrice"/>
+        <fillField userInput="{{simpleProduct.quantity}}" selector="{{AdminProductFormSection.productQuantity}}" stepKey="fillQuantity"/>
+        <searchAndMultiSelectOption selector="{{AdminProductFormSection.categoriesDropdown}}" parameterArray="[{{category.name}}]" stepKey="searchAndSelectCategory"/>
+        <click selector="{{AdminProductSEOSection.sectionHeader}}" stepKey="openSeoSection"/>
+        <fillField userInput="{{simpleProduct.urlKey}}" selector="{{AdminProductSEOSection.urlKeyInput}}" stepKey="fillUrlKey"/>
+
+        <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="saveProduct"/>
+        <seeElement selector="{{AdminProductMessagesSection.successMessage}}" stepKey="assertSaveMessageSuccess"/>
+        <seeInField userInput="{{simpleProduct.name}}" selector="{{AdminProductFormSection.productName}}" stepKey="assertFieldName"/>
+        <seeInField userInput="{{simpleProduct.sku}}" selector="{{AdminProductFormSection.productSku}}" stepKey="assertFieldSku"/>
+        <seeInField userInput="{{simpleProduct.price}}" selector="{{AdminProductFormSection.productPrice}}" stepKey="assertFieldPrice"/>
+        <click selector="{{AdminProductSEOSection.sectionHeader}}" stepKey="openSeoSectionAssert"/>
+        <seeInField userInput="{{simpleProduct.urlKey}}" selector="{{AdminProductSEOSection.urlKeyInput}}" stepKey="assertFieldUrlKey"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Sales/Test/Mftf/Data/DeveloperConfigData.xml b/app/code/Magento/Sales/Test/Mftf/Data/DeveloperConfigData.xml
new file mode 100644
index 0000000000000..0df9ec56195e0
--- /dev/null
+++ b/app/code/Magento/Sales/Test/Mftf/Data/DeveloperConfigData.xml
@@ -0,0 +1,22 @@
+<?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="StorefrontDisableMoveJsCodeBottom">
+        <!-- Magento default value -->
+        <data key="path">dev/js/move_script_to_bottom</data>
+        <data key="label">No</data>
+        <data key="value">0</data>
+    </entity>
+    <entity name="StorefrontEnableMoveJsCodeBottom">
+        <data key="path">dev/js/move_script_to_bottom</data>
+        <data key="label">Yes</data>
+        <data key="value">1</data>
+    </entity>
+</entities>
diff --git a/app/code/Magento/Sales/Test/Mftf/Test/StorefrontCreateOrdersWithMoveJSCodeBottomTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/StorefrontCreateOrdersWithMoveJSCodeBottomTest.xml
new file mode 100644
index 0000000000000..0888132669177
--- /dev/null
+++ b/app/code/Magento/Sales/Test/Mftf/Test/StorefrontCreateOrdersWithMoveJSCodeBottomTest.xml
@@ -0,0 +1,100 @@
+<?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="StorefrontCreateOrdersWithMoveJSCodeBottomTest">
+        <annotations>
+            <title value="Create a product and orders with set 'Move Js code to the bottom' to 'Yes'."/>
+            <description value="Create a product and orders with a set 'Move JS code to the bottom of the page' to 'Yes' for registered customers and guests."/>
+        </annotations>
+        <before>
+            <magentoCLI command="config:set {{StorefrontEnableMoveJsCodeBottom.path}} {{StorefrontEnableMoveJsCodeBottom.value}}" stepKey="moveJsCodeBottomEnable"/>
+            <magentoCLI command="cache:clean config full_page" stepKey="cleanInvalidatedCaches"/>
+            <actionGroup ref="AdminLoginActionGroup" stepKey="logInAsAdmin"/>
+            <actionGroup ref="AdminOpenCategoryPageActionGroup" stepKey="goToCategoryPage"/>
+            <actionGroup ref="CreateCategoryActionGroup" stepKey="createCategory">
+                <argument name="categoryEntity" value="_defaultCategory"/>
+            </actionGroup>
+            <actionGroup ref="AdminCreateSimpleProductActionGroup" stepKey="createSimpleProduct">
+                <argument name="category" value="_defaultCategory"/>
+                <argument name="simpleProduct" value="_defaultProduct"/>
+            </actionGroup>
+        </before>
+        <after>
+            <actionGroup ref="AdminOpenCategoryPageActionGroup" stepKey="goToCategoryPage"/>
+            <actionGroup ref="DeleteCategoryActionGroup" stepKey="deleteCategory">
+                <argument name="categoryEntity" value="_defaultCategory"/>
+            </actionGroup>
+            <actionGroup ref="DeleteProductActionGroup" stepKey="deleteSimpleProduct">
+                <argument name="productName" value="_defaultProduct.name"/>
+            </actionGroup>
+            <actionGroup ref="AdminDeleteCustomerActionGroup" stepKey="deleteCustomer">
+                <argument name="customerEmail" value="Simple_US_Customer.email"/>
+            </actionGroup>
+            <actionGroup ref="AdminLogoutActionGroup" stepKey="logoutFromAdmin"/>
+
+            <magentoCLI command="config:set {{StorefrontDisableMoveJsCodeBottom.path}} {{StorefrontDisableMoveJsCodeBottom.value}}" stepKey="moveJsCodeBottomDisable"/>
+            <magentoCLI command="cache:clean config full_page" stepKey="cleanInvalidatedCaches"/>
+        </after>
+
+        <!-- Go to Storefront and place order for guest -->
+        <actionGroup ref="StorefrontOpenProductPageActionGroup" stepKey="openStorefrontProductPage">
+            <argument name="productUrl" value="{{_defaultProduct.urlKey}}"/>
+        </actionGroup>
+
+        <actionGroup ref="StorefrontAddProductToCartActionGroup" stepKey="addProductToCart">
+            <argument name="product" value="_defaultProduct"/>
+            <argument name="productCount" value="1"/>
+        </actionGroup>
+        <actionGroup ref="GoToCheckoutFromMinicartActionGroup" stepKey="guestGoToCheckoutFromCart"/>
+        <actionGroup ref="GuestCheckoutFillNewShippingAddressActionGroup" stepKey="fillNewShippingAddress">
+            <argument name="customer" value="Simple_Customer_Without_Address" />
+            <argument name="address" value="US_Address_TX"/>
+        </actionGroup>
+        <actionGroup ref="StorefrontSetShippingMethodActionGroup" stepKey="setShippingMethodFreeShipping">
+            <argument name="shippingMethodName" value="Flat Rate"/>
+        </actionGroup>
+        <actionGroup ref="StorefrontCheckoutClickNextOnShippingStepActionGroup" stepKey="goToCheckoutReview"/>
+        <actionGroup ref="CheckoutSelectCheckMoneyOrderPaymentActionGroup" stepKey="selectCheckMoneyPayment"/>
+        <actionGroup ref="ClickPlaceOrderActionGroup" stepKey="guestPlaceOrder" />
+
+        <!-- Go to frontend and make a user account and login with it -->
+        <actionGroup ref="StorefrontOpenCustomerAccountCreatePageActionGroup" stepKey="openCreateAccountPage"/>
+        <actionGroup ref="StorefrontFillCustomerAccountCreationFormActionGroup" stepKey="fillCreateAccountForm">
+            <argument name="customer" value="Simple_US_Customer"/>
+        </actionGroup>
+        <actionGroup ref="StorefrontClickCreateAnAccountCustomerAccountCreationFormActionGroup" stepKey="submitCreateAccountForm"/>
+        <actionGroup ref="AssertMessageCustomerCreateAccountActionGroup" stepKey="seeSuccessMessage">
+            <argument name="messageType" value="success"/>
+            <argument name="message" value="Thank you for registering with Main Website Store."/>
+        </actionGroup>
+        <actionGroup ref="StorefrontAddNewCustomerAddressActionGroup" stepKey="AddNewAddress">
+            <argument name="Address" value="US_Address_TX"/>
+        </actionGroup>
+
+        <!-- Go to Storefront and place order for customer -->
+        <actionGroup ref="StorefrontOpenProductPageActionGroup" stepKey="openStorefrontProductPage2">
+            <argument name="productUrl" value="{{_defaultProduct.urlKey}}"/>
+        </actionGroup>
+
+        <actionGroup ref="StorefrontAddProductToCartActionGroup" stepKey="addProductToCart2">
+            <argument name="product" value="_defaultProduct"/>
+            <argument name="productCount" value="1"/>
+        </actionGroup>
+        <actionGroup ref="GoToCheckoutFromMinicartActionGroup" stepKey="customerGoToCheckoutFromCart"/>
+
+        <actionGroup ref="StorefrontSetShippingMethodActionGroup" stepKey="setShippingMethodFreeShipping2">
+            <argument name="shippingMethodName" value="Flat Rate"/>
+        </actionGroup>
+        <actionGroup ref="StorefrontCheckoutClickNextOnShippingStepActionGroup" stepKey="goToCheckoutReview2"/>
+        <actionGroup ref="CheckoutSelectCheckMoneyOrderPaymentActionGroup" stepKey="selectCheckMoneyPayment2"/>
+        <actionGroup ref="ClickPlaceOrderActionGroup" stepKey="customerPlaceOrder" />
+        <actionGroup ref="StorefrontSignOutActionGroup" stepKey="singOutCustomer" />
+    </test>
+</tests>

From 5ae4928dab6a2d4f303524bd50dcb4a47cd998c0 Mon Sep 17 00:00:00 2001
From: Vasya Tsviklinskyi <tsviklinskyi@gmail.com>
Date: Tue, 19 May 2020 15:20:54 +0300
Subject: [PATCH 115/120] MC-33679: [Cloud] Region name in locale is not
 showing in customer address details.

---
 .../Magento/Customer/Ui/Component/DataProviderTest.php          | 2 +-
 .../Customer/Ui/Component/Listing/Address/DataProviderTest.php  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev/tests/integration/testsuite/Magento/Customer/Ui/Component/DataProviderTest.php b/dev/tests/integration/testsuite/Magento/Customer/Ui/Component/DataProviderTest.php
index 09176697a06d9..8529d7baa744a 100644
--- a/dev/tests/integration/testsuite/Magento/Customer/Ui/Component/DataProviderTest.php
+++ b/dev/tests/integration/testsuite/Magento/Customer/Ui/Component/DataProviderTest.php
@@ -34,7 +34,7 @@ class DataProviderTest extends TestCase
     /**
      * @inheritdoc
      */
-    protected function setUp()
+    protected function setUp(): void
     {
         $this->initLocaleResolverMock();
     }
diff --git a/dev/tests/integration/testsuite/Magento/Customer/Ui/Component/Listing/Address/DataProviderTest.php b/dev/tests/integration/testsuite/Magento/Customer/Ui/Component/Listing/Address/DataProviderTest.php
index 249c48fc826ec..12e7b1bd3d0e9 100644
--- a/dev/tests/integration/testsuite/Magento/Customer/Ui/Component/Listing/Address/DataProviderTest.php
+++ b/dev/tests/integration/testsuite/Magento/Customer/Ui/Component/Listing/Address/DataProviderTest.php
@@ -40,7 +40,7 @@ class DataProviderTest extends TestCase
     /**
      * @inheritdoc
      */
-    protected function setUp()
+    protected function setUp(): void
     {
         $this->initLocaleResolverMock();
         $this->requestMock = $this->createMock(RequestInterface::class);

From bbdec92150a8bed6db19e7fd0a7dcb196b0459b5 Mon Sep 17 00:00:00 2001
From: Vasya Tsviklinskyi <tsviklinskyi@gmail.com>
Date: Wed, 20 May 2020 12:26:06 +0300
Subject: [PATCH 116/120] MC-33679: [Cloud] Region name in locale is not
 showing in customer address details.

---
 .../Model/ResourceModel/Address/Grid/Collection.php         | 6 +++++-
 .../Customer/Model/ResourceModel/Grid/Collection.php        | 6 +++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

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 37dec6dc29944..0e2eb3e1d8e65 100644
--- a/app/code/Magento/Customer/Model/ResourceModel/Address/Grid/Collection.php
+++ b/app/code/Magento/Customer/Model/ResourceModel/Address/Grid/Collection.php
@@ -192,7 +192,11 @@ public function addFieldToFilter($field, $condition = null)
             return $this;
         }
 
-        return parent::addFieldToFilter('main_table.' . $field, $condition);
+        if (is_string($field) && count(explode('.', $field)) === 1) {
+            $field = 'main_table.' . $field;
+        }
+
+        return parent::addFieldToFilter($field, $condition);
     }
 
     /**
diff --git a/app/code/Magento/Customer/Model/ResourceModel/Grid/Collection.php b/app/code/Magento/Customer/Model/ResourceModel/Grid/Collection.php
index 2ee3a30ba7991..bf8ef767063bd 100644
--- a/app/code/Magento/Customer/Model/ResourceModel/Grid/Collection.php
+++ b/app/code/Magento/Customer/Model/ResourceModel/Grid/Collection.php
@@ -81,7 +81,11 @@ public function addFieldToFilter($field, $condition = null)
             return $this;
         }
 
-        return parent::addFieldToFilter('main_table.' . $field, $condition);
+        if (is_string($field) && count(explode('.', $field)) === 1) {
+            $field = 'main_table.' . $field;
+        }
+
+        return parent::addFieldToFilter($field, $condition);
     }
 
     /**

From 76493a97c457fbf368e5ee53dcf62a7d64437f2d Mon Sep 17 00:00:00 2001
From: Vasya Tsviklinskyi <tsviklinskyi@gmail.com>
Date: Wed, 20 May 2020 12:37:59 +0300
Subject: [PATCH 117/120] MC-33523: Pagination on the Configurable Product Edit
 Current Variations Grid is wrong

---
 .../adminhtml/web/js/components/dynamic-rows-configurable.js | 2 +-
 .../Magento/Ui/view/base/web/js/dynamic-rows/dynamic-rows.js | 5 ++++-
 2 files changed, 5 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 4624f07323d59..68e7d146d33e0 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
@@ -212,7 +212,7 @@ define([
             );
 
             tmpData = data.slice(this.pageSize * (this.currentPage() - 1),
-                                 this.pageSize * (this.currentPage() - 1) + this.pageSize);
+                                 this.pageSize * (this.currentPage() - 1) + parseInt(this.pageSize, 10));
 
             this.source.set(this.dataScope + '.' + this.index, []);
 
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 cbbfbdb127ad7..5f29c5982e094 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
@@ -657,7 +657,7 @@ define([
 
             startIndex = page || this.startIndex;
 
-            return dataRecord.slice(startIndex, this.startIndex + this.pageSize);
+            return dataRecord.slice(startIndex, this.startIndex + parseInt(this.pageSize, 10));
         },
 
         /**
@@ -960,6 +960,9 @@ define([
         reload: function () {
             this.clear();
             this.initChildren(false, true);
+
+            /* After change page size need to check existing current page */
+            this._reducePages();
         },
 
         /**

From 7d13d0d2b8fd7f0036cfc26d29b437e413534bdb Mon Sep 17 00:00:00 2001
From: Serhii Balko <serhii.balko@transoftgroup.com>
Date: Wed, 20 May 2020 12:42:38 +0300
Subject: [PATCH 118/120] MC-33147: Stabilise integration tests

---
 .../View/LayoutTestWithExceptions.php         | 26 +++++++++++++------
 1 file changed, 18 insertions(+), 8 deletions(-)

diff --git a/dev/tests/integration/testsuite/Magento/Framework/View/LayoutTestWithExceptions.php b/dev/tests/integration/testsuite/Magento/Framework/View/LayoutTestWithExceptions.php
index 47f22346fbd62..fdaa2d00db827 100644
--- a/dev/tests/integration/testsuite/Magento/Framework/View/LayoutTestWithExceptions.php
+++ b/dev/tests/integration/testsuite/Magento/Framework/View/LayoutTestWithExceptions.php
@@ -5,12 +5,19 @@
  */
 namespace Magento\Framework\View;
 
-use \Magento\Framework\App\State;
+use Magento\Framework\App\State;
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\View\Layout\Element;
+use Magento\TestFramework\Helper\Bootstrap;
+use PHPUnit\Framework\TestCase;
 
-class LayoutTestWithExceptions extends \PHPUnit\Framework\TestCase
+/**
+ * Class to test Layout model functionality with exceptions
+ */
+class LayoutTestWithExceptions extends TestCase
 {
     /**
-     * @var \Magento\Framework\View\Layout
+     * @var Layout
      */
     protected $layout;
 
@@ -19,10 +26,10 @@ class LayoutTestWithExceptions extends \PHPUnit\Framework\TestCase
      */
     protected function setUp(): void
     {
-        $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
-        $layoutFactory = $objectManager->get(\Magento\Framework\View\LayoutFactory::class);
+        $objectManager = Bootstrap::getObjectManager();
+        $layoutFactory = $objectManager->get(LayoutFactory::class);
         $this->layout = $layoutFactory->create();
-        $layoutElement = new \Magento\Framework\View\Layout\Element(
+        $layoutElement = new Element(
             __DIR__ . '/_files/layout_with_exceptions/layout.xml',
             0,
             true
@@ -33,21 +40,24 @@ protected function setUp(): void
     }
 
     /**
+     * Test to Create structure of elements from the loaded XML configuration with exception
      */
     public function testProcessWithExceptionsDeveloperMode()
     {
-        $this->expectException(\Magento\Framework\Exception\LocalizedException::class);
+        $this->expectException(LocalizedException::class);
         $this->expectExceptionMessage('Construction problem.');
 
         $this->layout->generateElements();
     }
 
     /**
+     * Test to Get all blocks marked for output with exceptions
+     *
      * @magentoAppIsolation enabled
      */
     public function testProcessWithExceptions()
     {
-        \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(\Magento\Framework\App\State::class)
+        Bootstrap::getObjectManager()->get(State::class)
             ->setMode(State::MODE_DEFAULT);
 
         $this->layout->generateElements();

From e7bbc36771cb57bae449293b16c2019d2f045e82 Mon Sep 17 00:00:00 2001
From: Serhiy Yelahin <serhiy.yelahin@transoftgroup.com>
Date: Wed, 20 May 2020 15:05:18 +0300
Subject: [PATCH 119/120] MC-33730: Import address with region for a country
 that does not have regions defined failes in import/export

---
 .../Model/Import/Address.php                  | 47 ++++++++++------
 .../Model/Import/AddressTest.php              | 55 +++++++++++++++++++
 .../Model/Import/_files/import_uk_address.csv |  2 +
 3 files changed, 86 insertions(+), 18 deletions(-)
 create mode 100644 dev/tests/integration/testsuite/Magento/CustomerImportExport/Model/Import/_files/import_uk_address.csv

diff --git a/app/code/Magento/CustomerImportExport/Model/Import/Address.php b/app/code/Magento/CustomerImportExport/Model/Import/Address.php
index 09d76ec3fb71f..a5947f48bea5f 100644
--- a/app/code/Magento/CustomerImportExport/Model/Import/Address.php
+++ b/app/code/Magento/CustomerImportExport/Model/Import/Address.php
@@ -54,6 +54,8 @@ class Address extends AbstractCustomer
 
     /**#@-*/
 
+    const COLUMN_REGION_ID = 'region_id';
+
     /**#@+
      * Particular columns that contains of customer default addresses
      */
@@ -666,13 +668,17 @@ protected function _prepareDataForUpdate(array $rowData): array
             }
         }
         // let's try to find region ID
-        $entityRow['region_id'] = null;
+        $entityRow[self::COLUMN_REGION_ID] = null;
 
-        if (!empty($rowData[self::COLUMN_REGION])
-            && $this->getCountryRegionId($rowData[self::COLUMN_COUNTRY_ID], $rowData[self::COLUMN_REGION]) !== false) {
-            $regionId = $this->getCountryRegionId($rowData[self::COLUMN_COUNTRY_ID], $rowData[self::COLUMN_REGION]);
-            $entityRow[self::COLUMN_REGION] = $this->_regions[$regionId];
-            $entityRow['region_id'] = $regionId;
+        if (!empty($entityRow[self::COLUMN_REGION]) && !empty($entityRow[self::COLUMN_COUNTRY_ID])) {
+            $entityRow[self::COLUMN_REGION_ID] = $this->getCountryRegionId(
+                $entityRow[self::COLUMN_COUNTRY_ID],
+                $entityRow[self::COLUMN_REGION]
+            );
+            // override the region name with its proper name if region ID is found
+            $entityRow[self::COLUMN_REGION] = $entityRow[self::COLUMN_REGION_ID] !== null
+                ? $this->_regions[$entityRow[self::COLUMN_REGION_ID]]
+                : $entityRow[self::COLUMN_REGION];
         }
         if ($newAddress) {
             $entityRowNew = $entityRow;
@@ -833,7 +839,7 @@ public static function getDefaultAddressAttributeMapping()
      * Check if address for import is empty (for customer composite mode)
      *
      * @param array $rowData
-     * @return array
+     * @return bool
      */
     protected function _isOptionalAddressEmpty(array $rowData)
     {
@@ -914,7 +920,8 @@ protected function _validateRowForUpdate(array $rowData, $rowNumber)
 
                     if (isset($rowData[self::COLUMN_REGION])
                         && !empty($rowData[self::COLUMN_REGION])
-                        && false === $this->getCountryRegionId(
+                        && count($this->getCountryRegions($rowData[self::COLUMN_COUNTRY_ID])) > 0
+                        && null === $this->getCountryRegionId(
                             $rowData[self::COLUMN_COUNTRY_ID],
                             $rowData[self::COLUMN_REGION]
                         )
@@ -994,18 +1001,22 @@ public function setCustomerAttributes($customerAttributes)
      *
      * @param string $countryId
      * @param string $region
-     * @return bool|int
+     * @return int|null
      */
-    private function getCountryRegionId(string $countryId, string $region)
+    private function getCountryRegionId(string $countryId, string $region): ?int
     {
-        $countryNormalized = strtolower($countryId);
-        $regionNormalized = strtolower($region);
-
-        if (isset($this->_countryRegions[$countryNormalized])
-            && isset($this->_countryRegions[$countryNormalized][$regionNormalized])) {
-            return $this->_countryRegions[$countryNormalized][$regionNormalized];
-        }
+        $countryRegions = $this->getCountryRegions($countryId);
+        return $countryRegions[strtolower($region)] ?? null;
+    }
 
-        return false;
+    /**
+     * Get country regions
+     *
+     * @param string $countryId
+     * @return array
+     */
+    private function getCountryRegions(string $countryId): array
+    {
+        return $this->_countryRegions[strtolower($countryId)] ?? [];
     }
 }
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 16e2f03bf49a4..832aabe6b6a78 100644
--- a/dev/tests/integration/testsuite/Magento/CustomerImportExport/Model/Import/AddressTest.php
+++ b/dev/tests/integration/testsuite/Magento/CustomerImportExport/Model/Import/AddressTest.php
@@ -9,10 +9,15 @@
  */
 namespace Magento\CustomerImportExport\Model\Import;
 
+use Magento\Customer\Api\AddressRepositoryInterface;
+use Magento\Customer\Api\CustomerRepositoryInterface;
+use Magento\Customer\Api\Data\AddressInterface;
+use Magento\Framework\Api\SearchCriteriaBuilder;
 use Magento\Framework\App\Filesystem\DirectoryList;
 use Magento\Framework\Filesystem;
 use Magento\ImportExport\Model\Import as ImportModel;
 use Magento\ImportExport\Model\Import\Adapter as ImportAdapter;
+use Magento\ImportExport\Model\Import\Source\Csv;
 use Magento\TestFramework\Helper\Bootstrap;
 use Magento\Framework\Indexer\StateInterface;
 use ReflectionClass;
@@ -483,4 +488,54 @@ public function testCustomerIndexer(): void
         $this->assertEquals(StateInterface::STATUS_VALID, $statusBeforeImport);
         $this->assertEquals(StateInterface::STATUS_INVALID, $statusAfterImport);
     }
+
+    /**
+     * Test import address with region for a country that does not have regions defined
+     *
+     * @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');
+        $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();
+        $address = $this->getAddresses(
+            [
+                'parent_id' => $customer->getId(),
+                'country_id' => 'GB',
+            ]
+        );
+        $this->assertCount(1, $address);
+        $this->assertNull($address[0]->getRegionId());
+        $this->assertEquals('Liverpool', $address[0]->getRegion()->getRegion());
+    }
+
+    /**
+     * Get Addresses by filter
+     *
+     * @param array $filter
+     * @return AddressInterface[]
+     */
+    private function getAddresses(array $filter): array
+    {
+        $objectManager = Bootstrap::getObjectManager();
+        /** @var AddressRepositoryInterface $repository */
+        $repository = $objectManager->create(AddressRepositoryInterface::class);
+        /** @var SearchCriteriaBuilder $searchCriteriaBuilder */
+        $searchCriteriaBuilder = $objectManager->get(SearchCriteriaBuilder::class);
+        foreach ($filter as $attr => $value) {
+            $searchCriteriaBuilder->addFilter($attr, $value);
+        }
+        return $repository->getList($searchCriteriaBuilder->create())->getItems();
+    }
 }
diff --git a/dev/tests/integration/testsuite/Magento/CustomerImportExport/Model/Import/_files/import_uk_address.csv b/dev/tests/integration/testsuite/Magento/CustomerImportExport/Model/Import/_files/import_uk_address.csv
new file mode 100644
index 0000000000000..861f71fd43770
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/CustomerImportExport/Model/Import/_files/import_uk_address.csv
@@ -0,0 +1,2 @@
+_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_
+base,"BetsyParker@example.com",,Liverpool,,GB,,Mike,Miller,,"L2 2AY",,"Liverpool",0,"Moorfields, Vernon St",," +443450507080",,,,,,,

From 15375b2c504a5886d873ba0d71a142943deefa87 Mon Sep 17 00:00:00 2001
From: "rostyslav.hymon" <rostyslav.hymon@transoftgroup.com>
Date: Thu, 21 May 2020 14:14:02 +0300
Subject: [PATCH 120/120] MC-34261: [MAGENTO CLOUD] Incorrect refund amount
 refunded to customer

---
 .../Adminhtml/Sales/Order/Items/Renderer.php  |   3 +-
 .../Sales/Order/Items/RendererTest.php        |  23 +--
 .../CreditMemo/Create/ItemsToRenderTest.php   | 143 ++++++++++++++++++
 .../CreditMemo/Create/ItemsToRender.php       |  77 ++++++++++
 .../layout/sales_order_creditmemo_new.xml     |   1 +
 .../sales_order_creditmemo_updateqty.xml      |   1 +
 .../order/creditmemo/create/items.phtml       |  25 +--
 7 files changed, 252 insertions(+), 21 deletions(-)
 create mode 100644 app/code/Magento/Sales/Test/Unit/ViewModel/CreditMemo/Create/ItemsToRenderTest.php
 create mode 100644 app/code/Magento/Sales/ViewModel/CreditMemo/Create/ItemsToRender.php

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..b4134e7e3a97e 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
@@ -51,7 +51,7 @@ public function __construct(
      * @param string $value
      * @param int $length
      * @param string $etc
-     * @param string &$remainder
+     * @param string $remainder
      * @param bool $breakWords
      * @return string
      */
@@ -83,6 +83,7 @@ public function getChildren($item)
         }
 
         if ($items) {
+            $itemsArray[$item->getOrderItem()->getId()][$item->getOrderItemId()] = $item;
             foreach ($items as $value) {
                 $parentItem = $value->getOrderItem()->getParentItem();
                 if ($parentItem) {
diff --git a/app/code/Magento/Bundle/Test/Unit/Block/Adminhtml/Sales/Order/Items/RendererTest.php b/app/code/Magento/Bundle/Test/Unit/Block/Adminhtml/Sales/Order/Items/RendererTest.php
index 07460549aea18..daf90f9a07af3 100644
--- a/app/code/Magento/Bundle/Test/Unit/Block/Adminhtml/Sales/Order/Items/RendererTest.php
+++ b/app/code/Magento/Bundle/Test/Unit/Block/Adminhtml/Sales/Order/Items/RendererTest.php
@@ -17,6 +17,9 @@
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 
+/**
+ * Test Renderer order item
+ */
 class RendererTest extends TestCase
 {
     /** @var Item|MockObject */
@@ -98,25 +101,27 @@ public function testGetChildren($parentItem)
             $parentItem = $this->createPartialMock(Item::class, ['getId', '__wakeup']);
             $parentItem->expects($this->any())->method('getId')->willReturn(1);
         }
-        $this->orderItem->expects($this->any())->method('getOrderItem')->willReturnSelf();
-        $this->orderItem->expects($this->any())->method('getParentItem')->willReturn($parentItem);
-        $this->orderItem->expects($this->any())->method('getOrderItemId')->willReturn(2);
-        $this->orderItem->expects($this->any())->method('getId')->willReturn(1);
+        $this->orderItem->method('getOrderItem')->willReturnSelf();
+        $this->orderItem->method('getParentItem')->willReturn($parentItem);
+        $this->orderItem->method('getOrderItemId')->willReturn(2);
+        $this->orderItem->method('getId')->willReturn(1);
 
         $salesModel = $this->createPartialMock(
             Invoice::class,
             ['getAllItems', '__wakeup']
         );
-        $salesModel->expects($this->once())->method('getAllItems')->willReturn([$this->orderItem]);
+        $salesModel->method('getAllItems')->willReturn([$this->orderItem]);
 
         $item = $this->createPartialMock(
             \Magento\Sales\Model\Order\Invoice\Item::class,
-            ['getInvoice', 'getOrderItem', '__wakeup']
+            ['getInvoice', 'getOrderItem', 'getOrderItemId', '__wakeup']
         );
-        $item->expects($this->once())->method('getInvoice')->willReturn($salesModel);
-        $item->expects($this->any())->method('getOrderItem')->willReturn($this->orderItem);
+        $item->method('getInvoice')->willReturn($salesModel);
+        $item->method('getOrderItem')->willReturn($this->orderItem);
+        $item->method('getOrderItemId')->willReturn($this->orderItem->getOrderItemId());
 
-        $this->assertSame([2 => $this->orderItem], $this->model->getChildren($item));
+        $orderItem = $this->model->getChildren($item);
+        $this->assertSame([2 => $this->orderItem], $orderItem);
     }
 
     /**
diff --git a/app/code/Magento/Sales/Test/Unit/ViewModel/CreditMemo/Create/ItemsToRenderTest.php b/app/code/Magento/Sales/Test/Unit/ViewModel/CreditMemo/Create/ItemsToRenderTest.php
new file mode 100644
index 0000000000000..28a99e06a2f69
--- /dev/null
+++ b/app/code/Magento/Sales/Test/Unit/ViewModel/CreditMemo/Create/ItemsToRenderTest.php
@@ -0,0 +1,143 @@
+<?php
+/**
+ *
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Sales\Test\Unit\ViewModel\CreditMemo\Create;
+
+use Magento\Sales\Model\Convert\Order as ConvertOrder;
+use Magento\Sales\Block\Adminhtml\Order\Creditmemo\Create\Items as BlockItems;
+use Magento\Sales\Model\Order\Creditmemo\Item as CreditmemoItem;
+use Magento\Sales\Model\Order\Creditmemo;
+use Magento\Sales\Model\Order\Item as OrderItem;
+use Magento\Sales\ViewModel\CreditMemo\Create\ItemsToRender;
+use PHPUnit\Framework\MockObject\MockObject;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use PHPUnit\Framework\TestCase;
+
+/**
+ * Test creditmemo items to render
+ */
+class ItemsToRenderTest extends TestCase
+{
+    /**
+     * @var ItemsToRender
+     */
+    private $itemsToRender;
+
+    /**
+     * @var ConvertOrder|MockObject
+     */
+    private $converter;
+
+    /**
+     * @var BlockItems|MockObject
+     */
+    private $blockItems;
+
+    /**
+     * @var Creditmemo|MockObject
+     */
+    private $creditmemo;
+
+    /**
+     * @var CreditmemoItem|MockObject
+     */
+    private $creditmemoItem;
+
+    /**
+     * @var CreditmemoItem|MockObject
+     */
+    private $creditmemoItemParent;
+
+    /**
+     * @var OrderItem|MockObject
+     */
+    private $orderItem;
+
+    /**
+     * @var OrderItem|MockObject
+     */
+    private $orderItemParent;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp(): void
+    {
+        $this->converter = $this->getMockBuilder(ConvertOrder::class)
+            ->onlyMethods(['itemToCreditmemoItem'])
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->blockItems = $this->getMockBuilder(BlockItems::class)
+            ->onlyMethods(['getCreditmemo'])
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->creditmemo = $this->getMockBuilder(Creditmemo::class)
+            ->onlyMethods(['getAllItems', 'getId', 'getStoreId'])
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->creditmemoItem = $this->getMockBuilder(CreditmemoItem::class)
+            ->onlyMethods(['getOrderItem', 'getCreditMemo'])
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->creditmemoItemParent = $this->getMockBuilder(CreditmemoItem::class)
+            ->onlyMethods(['setCreditmemo', 'setParentId'])
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->creditmemoItemParent = $this->getMockBuilder(CreditmemoItem::class)
+            ->addMethods(['getItemId', 'setStoreId'])
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->orderItem = $this->getMockBuilder(OrderItem::class)
+            ->onlyMethods(['getParentItem'])
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->orderItemParent = $this->getMockBuilder(OrderItem::class)
+            ->onlyMethods(['getItemId'])
+            ->disableOriginalConstructor()
+            ->getMock();
+        /** @var ObjectManager  */
+        $objectManager = new ObjectManager($this);
+        $this->itemsToRender = $objectManager->getObject(
+            ItemsToRender::class,
+            [
+                'items' => $this->blockItems,
+                'converter' => $this->converter
+            ]
+        );
+    }
+
+    /**
+     * Test get items
+     */
+    public function testGetItems(): void
+    {
+        $this->blockItems->method('getCreditmemo')
+            ->willReturn($this->creditmemo);
+        $this->creditmemo->method('getAllItems')
+            ->willReturn([$this->creditmemoItem]);
+        $this->creditmemo->method('getId')
+            ->willReturn(1);
+        $this->creditmemoItem->method('getCreditmemo')
+            ->willReturn($this->creditmemo);
+        $this->creditmemo->method('getStoreId')
+            ->willReturn(1);
+        $this->creditmemoItem->method('getOrderItem')
+            ->willReturn($this->orderItem);
+        $this->orderItem->method('getParentItem')
+            ->willReturn($this->orderItemParent);
+        $this->orderItemParent->method('getItemId')
+            ->willReturn(1);
+        $this->converter->method('itemToCreditmemoItem')
+            ->willReturn($this->creditmemoItemParent);
+
+        $this->assertEquals(
+            [$this->creditmemoItemParent, $this->creditmemoItem],
+            $this->itemsToRender->getItems()
+        );
+    }
+}
diff --git a/app/code/Magento/Sales/ViewModel/CreditMemo/Create/ItemsToRender.php b/app/code/Magento/Sales/ViewModel/CreditMemo/Create/ItemsToRender.php
new file mode 100644
index 0000000000000..51b54e80ed060
--- /dev/null
+++ b/app/code/Magento/Sales/ViewModel/CreditMemo/Create/ItemsToRender.php
@@ -0,0 +1,77 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\Sales\ViewModel\CreditMemo\Create;
+
+use Magento\Framework\View\Element\Block\ArgumentInterface;
+use Magento\Sales\Block\Adminhtml\Order\Creditmemo\Create\Items;
+use Magento\Sales\Model\Convert\OrderFactory;
+use Magento\Sales\Model\Convert\Order as ConvertOrder;
+use Magento\Sales\Model\Order\Creditmemo\Item;
+
+/**
+ * View model to return creditmemo items for rendering
+ */
+class ItemsToRender implements ArgumentInterface
+{
+    /**
+     * @var Items
+     */
+    private $items;
+
+    /**
+     * @var ConvertOrder
+     */
+    private $converter;
+
+    /**
+     * @param Items $items
+     * @param OrderFactory $convertOrderFactory
+     */
+    public function __construct(
+        Items $items,
+        OrderFactory $convertOrderFactory
+    ) {
+        $this->items = $items;
+        $this->converter = $convertOrderFactory->create();
+    }
+
+    /**
+     * Return creditmemo items for rendering and make sure all its parents are included
+     *
+     * @return Item[]
+     */
+    public function getItems(): array
+    {
+        $creditMemo = null;
+        $parents = [];
+        $items = [];
+        foreach ($this->items->getCreditmemo()->getAllItems() as $item) {
+            if (!$creditMemo) {
+                $creditMemo = $item->getCreditmemo();
+            }
+            $orderItem = $item->getOrderItem();
+            if ($orderItem->getChildrenItems()) {
+                $parents[] = $orderItem->getItemId();
+            }
+        }
+        foreach ($this->items->getCreditmemo()->getAllItems() as $item) {
+            $orderItemParent = $item->getOrderItem()->getParentItem();
+            if ($orderItemParent && !in_array($orderItemParent->getItemId(), $parents)) {
+                $itemParent = $this->converter->itemToCreditmemoItem($orderItemParent);
+                $itemParent->setCreditmemo($creditMemo)
+                    ->setParentId($creditMemo->getId())
+                    ->setStoreId($creditMemo->getStoreId());
+                $items[] = $itemParent;
+                $parents[] = $orderItemParent->getItemId();
+            }
+            $items[] = $item;
+        }
+        return $items;
+    }
+}
diff --git a/app/code/Magento/Sales/view/adminhtml/layout/sales_order_creditmemo_new.xml b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_creditmemo_new.xml
index cd7ca1d7e0d42..1bf18bc4d2b22 100644
--- a/app/code/Magento/Sales/view/adminhtml/layout/sales_order_creditmemo_new.xml
+++ b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_creditmemo_new.xml
@@ -20,6 +20,7 @@
                     <block class="Magento\Sales\Block\Adminhtml\Order\Creditmemo\Create\Items" name="order_items" template="Magento_Sales::order/creditmemo/create/items.phtml">
                         <arguments>
                             <argument name="viewModel" xsi:type="object">Magento\Sales\ViewModel\CreditMemo\Create\UpdateTotalsButton</argument>
+                            <argument name="itemsToRenderViewModel" xsi:type="object">Magento\Sales\ViewModel\CreditMemo\Create\ItemsToRender</argument>
                         </arguments>
                         <block class="Magento\Sales\Block\Adminhtml\Items\Renderer\DefaultRenderer" name="order_items.default" as="default" template="Magento_Sales::order/creditmemo/create/items/renderer/default.phtml"/>
                         <block class="Magento\Sales\Block\Adminhtml\Items\Column\Qty" name="column_qty" template="Magento_Sales::items/column/qty.phtml" group="column"/>
diff --git a/app/code/Magento/Sales/view/adminhtml/layout/sales_order_creditmemo_updateqty.xml b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_creditmemo_updateqty.xml
index 94ef0bf9d7a03..ec7af89754d9a 100644
--- a/app/code/Magento/Sales/view/adminhtml/layout/sales_order_creditmemo_updateqty.xml
+++ b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_creditmemo_updateqty.xml
@@ -11,6 +11,7 @@
         <block class="Magento\Sales\Block\Adminhtml\Order\Creditmemo\Create\Items" name="order_items" template="Magento_Sales::order/creditmemo/create/items.phtml">
             <arguments>
                 <argument name="viewModel" xsi:type="object">Magento\Sales\ViewModel\CreditMemo\Create\UpdateTotalsButton</argument>
+                <argument name="itemsToRenderViewModel" xsi:type="object">Magento\Sales\ViewModel\CreditMemo\Create\ItemsToRender</argument>
             </arguments>
             <block class="Magento\Sales\Block\Adminhtml\Items\Renderer\DefaultRenderer" name="order_items.default" as="default" template="Magento_Sales::order/creditmemo/create/items/renderer/default.phtml"/>
             <block class="Magento\Sales\Block\Adminhtml\Items\Column\Qty" name="column_qty" template="Magento_Sales::items/column/qty.phtml" group="column"/>
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..2bb085a51e377 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
@@ -9,7 +9,10 @@
 <?php
 /** @var Magento\Sales\ViewModel\CreditMemo\Create\UpdateTotalsButton $viewModel */
 $viewModel = $block->getData('viewModel');
-$_items = $block->getCreditmemo()->getAllItems();
+/** @var Magento\Sales\ViewModel\CreditMemo\Create\ItemsToRender $itemsToRenderViewModel */
+$itemsToRenderViewModel = $block->getData('itemsToRenderViewModel');
+$_items = $itemsToRenderViewModel->getItems();
+$commentText = $block->getCreditmemo()->getCommentText();
 ?>
 
 <section class="admin__page-section">
@@ -17,7 +20,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 +28,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 +38,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 +49,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 +62,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 +71,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 +97,7 @@ $_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($commentText) ?></textarea>
                     </div>
                 </div>
             </div>
@@ -116,7 +119,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"