From c5fe5e71689f1a269fb30dd340cbbcc8d7e3bab2 Mon Sep 17 00:00:00 2001
From: Mikalai Shostka <mikalai_shostka@epam.com>
Date: Wed, 24 Oct 2018 13:11:53 +0300
Subject: [PATCH 01/70] MAGETWO-95834: Unable to create Configurations for
 Configurable Products

- Add validation before serialize data
---
 .../view/adminhtml/web/js/variations/variations.js          | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/app/code/Magento/ConfigurableProduct/view/adminhtml/web/js/variations/variations.js b/app/code/Magento/ConfigurableProduct/view/adminhtml/web/js/variations/variations.js
index a46943bd5d145..d7f1f540df19d 100644
--- a/app/code/Magento/ConfigurableProduct/view/adminhtml/web/js/variations/variations.js
+++ b/app/code/Magento/ConfigurableProduct/view/adminhtml/web/js/variations/variations.js
@@ -383,7 +383,11 @@ define([
          * Chose action for the form save button
          */
         saveFormHandler: function () {
-            this.serializeData();
+            this.formElement().validate();
+
+            if (this.formElement().source.get('params.invalid') === false) {
+                this.serializeData();
+            }
 
             if (this.checkForNewAttributes()) {
                 this.formSaveParams = arguments;

From 3e8f9a6ca641b2212628118abc33141038827583 Mon Sep 17 00:00:00 2001
From: Alexey Yakimovich <yakimovich@almagy.com>
Date: Fri, 26 Oct 2018 15:25:54 +0300
Subject: [PATCH 02/70] MAGETWO-95837: Product is added to Wish List with
 Attributes selected however they were unselected on PDP before

- Fixed an issue with incorrect attributes processing before adding to wishlist;
---
 .../view/frontend/web/js/add-to-wishlist.js      | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/app/code/Magento/Wishlist/view/frontend/web/js/add-to-wishlist.js b/app/code/Magento/Wishlist/view/frontend/web/js/add-to-wishlist.js
index 7ce934317263b..18b4f2eb2121a 100644
--- a/app/code/Magento/Wishlist/view/frontend/web/js/add-to-wishlist.js
+++ b/app/code/Magento/Wishlist/view/frontend/web/js/add-to-wishlist.js
@@ -163,16 +163,12 @@ define([
                     data[elementName + '[' + option + ']'] = option;
                 });
             } else {
-                if (elementValue) { //eslint-disable-line no-lonely-if
-                    if (elementName.substr(elementName.length - 2) == '[]') { //eslint-disable-line eqeqeq, max-depth
-                        elementName = elementName.substring(0, elementName.length - 2);
-
-                        if (elementValue) { //eslint-disable-line max-depth
-                            data[elementName + '[' + elementValue + ']'] = elementValue;
-                        }
-                    } else {
-                        data[elementName] = elementValue;
-                    }
+                if (elementName.substr(elementName.length - 2) == '[]') { //eslint-disable-line eqeqeq, max-depth
+                    elementName = elementName.substring(0, elementName.length - 2);
+
+                    data[elementName + '[' + elementValue + ']'] = elementValue;
+                } else {
+                    data[elementName] = elementValue;
                 }
             }
 

From af8c0bd6a3f27f3dfa329fb03d4a993d6054b0b6 Mon Sep 17 00:00:00 2001
From: Lusine <lusine_papyan@epam.com>
Date: Mon, 29 Oct 2018 18:17:22 +0400
Subject: [PATCH 03/70] MAGETWO-95837: Product is added to Wish List with
 Attributes selected however they were unselected on PDP before

- Add automated test
---
 ...ddToCartWishListWithUnselectedAttrTest.xml | 69 +++++++++++++++++++
 1 file changed, 69 insertions(+)
 create mode 100644 app/code/Magento/Wishlist/Test/Mftf/Test/ConfProdAddToCartWishListWithUnselectedAttrTest.xml

diff --git a/app/code/Magento/Wishlist/Test/Mftf/Test/ConfProdAddToCartWishListWithUnselectedAttrTest.xml b/app/code/Magento/Wishlist/Test/Mftf/Test/ConfProdAddToCartWishListWithUnselectedAttrTest.xml
new file mode 100644
index 0000000000000..f29fb5ee6f34a
--- /dev/null
+++ b/app/code/Magento/Wishlist/Test/Mftf/Test/ConfProdAddToCartWishListWithUnselectedAttrTest.xml
@@ -0,0 +1,69 @@
+<?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="ConfProdAddToCartWishListWithUnselectedAttrTest">
+        <annotations>
+            <features value="Wishlist"/>
+            <stories value="MAGETWO-95837: Product is added to Wish List with Attributes selected however they were unselected on PDP before"/>
+            <group value="wishlist"/>
+            <title value="Adding configurable product to Cart from Wish List with unselected attributes"/>
+            <description value="Verify adding configurable product to Cart from Wish List when attributes is unselected"/>
+            <severity value="AVERAGE"/>
+            <testCaseId value="MAGETWO-95897"/>
+        </annotations>
+
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin1"/>
+            <createData entity="ApiCategory" stepKey="createCategory"/>
+            <!--Create Configurable product-->
+            <actionGroup ref="createConfigurableProduct" stepKey="createProduct">
+                <argument name="product" value="_defaultProduct"/>
+                <argument name="category" value="$$createCategory$$"/>
+            </actionGroup>
+            <createData entity="Simple_US_Customer" stepKey="createCustomer"/>
+        </before>
+
+        <!--Login as customer -->
+        <actionGroup ref="LoginToStorefrontActionGroup" stepKey="loginToStorefrontAccount">
+            <argument name="Customer" value="$$createCustomer$$"/>
+        </actionGroup>
+        <waitForPageLoad stepKey="waitForLogin"/>
+
+        <!--Go To Created Product Page-->
+        <amOnPage stepKey="goToCreatedProductPage" url="{{_defaultProduct.urlKey}}.html"/>
+        <waitForPageLoad stepKey="waitForProductPageLoad2"/>
+
+        <seeElement selector="{{StorefrontProductInfoMainSection.productAttributeOptions1}}" stepKey="checkDropDownProductOption"/>
+        <selectOption userInput="{{colorProductAttribute1.name}}" selector="{{StorefrontProductInfoMainSection.productAttributeOptionsSelectButton}}" stepKey="selectOption1"/>
+        <selectOption userInput="{{colorProductAttribute2.name}}" selector="{{StorefrontProductInfoMainSection.productAttributeOptionsSelectButton}}" stepKey="selectOption2"/>
+        <click selector="{{StorefrontProductInfoMainSection.productAttributeOptions1}}" stepKey="clickDropDownProductOption"/>
+
+        <!--Add the product to Wish List-->
+        <click selector="{{StorefrontProductPageSection.addToWishlist}}" stepKey="addFirstPnroductToWishlist"/>
+        <waitForPageLoad stepKey="waitForLoading"/>
+        <!--Click "Add All to Cart" button-->
+        <click selector="{{StorefrontCustomerWishlistProductSection.ProductAddAllToCart}}" stepKey="addAllToCart"/>
+
+        <!--Assert Correct Error Message-->
+        <see userInput="You need to choose options for your item for" stepKey="assertCorrectErrorMessage"/>
+        <dontSee userInput="1 product(s) have been added to shopping cart" stepKey="dontSeeSuccessMessage"/>
+
+        <after>
+            <deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/>
+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
+            <!-- Delete the first simple product -->
+            <actionGroup stepKey="deleteProduct1" ref="deleteProductBySku">
+                <argument name="sku" value="{{_defaultProduct.sku}}"/>
+            </actionGroup>
+            <conditionalClick selector="{{AdminProductGridFilterSection.clearFilters}}"
+                              dependentSelector="{{AdminProductGridFilterSection.clearFilters}}" visible="true" stepKey="clickClearFilters"/>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+    </test>
+</tests>

From 272a361992929f7080327d758553c91010f380a6 Mon Sep 17 00:00:00 2001
From: David Grigoryan <david_grigoryan@epam.com>
Date: Tue, 30 Oct 2018 17:00:03 +0400
Subject: [PATCH 04/70] MAGETWO-95834: Unable to create Configurations for
 Configurable Products

- Add automated test
---
 ...AdminChooseAffectedAttributeSetSection.xml |   3 +-
 .../AdminProductFormConfigurationsSection.xml |   2 +
 ...nCheckValidatorConfigurableProductTest.xml | 126 ++++++++++++++++++
 3 files changed, 130 insertions(+), 1 deletion(-)
 create mode 100644 app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminCheckValidatorConfigurableProductTest.xml

diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Section/AdminChooseAffectedAttributeSetSection.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Section/AdminChooseAffectedAttributeSetSection.xml
index 4289638352990..6e8303e6baead 100644
--- a/app/code/Magento/ConfigurableProduct/Test/Mftf/Section/AdminChooseAffectedAttributeSetSection.xml
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Section/AdminChooseAffectedAttributeSetSection.xml
@@ -10,5 +10,6 @@
         xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
     <section name="AdminChooseAffectedAttributeSetPopup">
         <element name="confirm" type="button" selector="button[data-index='confirm_button']" timeout="30"/>
+        <element name="closePopUp" type="button" selector="//*[contains(@class,'product_form_product_form_configurable_attribute_set')]//button[@data-role='closeBtn']" timeout="30"/>
     </section>
-</sections>
\ No newline at end of file
+</sections>
diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Section/AdminProductFormConfigurationsSection.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Section/AdminProductFormConfigurationsSection.xml
index 0de7bc00044c8..6db733b689d45 100644
--- a/app/code/Magento/ConfigurableProduct/Test/Mftf/Section/AdminProductFormConfigurationsSection.xml
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Section/AdminProductFormConfigurationsSection.xml
@@ -22,6 +22,8 @@
         <element name="removeProductBtn" type="button" selector="//a[text()='Remove Product']"/>
         <element name="disableProductBtn" type="button" selector="//a[text()='Disable Product']"/>
         <element name="enableProductBtn" type="button" selector="//a[text()='Enable Product']"/>
+        <element name="confProductSku" type="input" selector="//*[@name='configurable-matrix[{{arg}}][sku]']" parameterized="true"/>
+        <element name="confProductSkuMessage" type="text" selector="//*[@name='configurable-matrix[{{arg}}][sku]']/following-sibling::label" parameterized="true"/>
     </section>
     <section name="AdminConfigurableProductFormSection">
         <element name="productWeight" type="input" selector=".admin__control-text[name='product[weight]']"/>
diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminCheckValidatorConfigurableProductTest.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminCheckValidatorConfigurableProductTest.xml
new file mode 100644
index 0000000000000..44ab6e2e8e04f
--- /dev/null
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminCheckValidatorConfigurableProductTest.xml
@@ -0,0 +1,126 @@
+<?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="AdminCheckValidatorConfigurableProductTest">
+        <annotations>
+            <features value="ConfigurableProduct"/>
+            <stories value="MAGETWO-95834: Unable to create Configurations for Configurable Products"/>
+            <title value="Check that validator works correctly when creating Configurations for Configurable Products"/>
+            <description value="Verify validator works correctly for Configurable Products"/>
+            <severity value="MAJOR"/>
+            <testCaseId value="MAGETWO-95995"/>
+            <group value="ConfigurableProduct"/>
+        </annotations>
+
+        <before>
+            <!--Login as admin-->
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+            <!--Create Category-->
+            <createData entity="ApiCategory" stepKey="createCategory"/>
+            <!--Create Configurable product-->
+            <createData entity="ApiConfigurableProduct" stepKey="createConfigProduct">
+                <requiredEntity createDataKey="createCategory"/>
+            </createData>
+        </before>
+
+        <!-- Find the product that we just created using the product grid -->
+        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="visitAdminProductPage"/>
+        <waitForPageLoad stepKey="waitForAdminProductPageLoad"/>
+        <conditionalClick selector="{{AdminProductGridFilterSection.clearFilters}}"
+            dependentSelector="{{AdminProductGridFilterSection.clearFilters}}" visible="true" stepKey="clickClearFiltersInitial"/>
+        <actionGroup ref="filterProductGridBySku" stepKey="findCreatedProduct">
+            <argument name="product" value="ApiConfigurableProduct"/>
+        </actionGroup>
+        <waitForPageLoad stepKey="waitForProductFilterLoad"/>
+        <click selector="{{AdminProductGridSection.firstRow}}" stepKey="clickOnProductPage"/>
+        <waitForPageLoad stepKey="waitForProductPageLoad"/>
+
+        <!-- Create configurations based off the Text Swatch we created earlier -->
+        <click selector="{{AdminProductFormConfigurationsSection.createConfigurations}}" stepKey="clickCreateConfigurations"/>
+
+        <!--Create new attribute-->
+        <waitForElementVisible stepKey="waitForNewAttributePageOpened" selector="{{AdminCreateProductConfigurationsPanel.createNewAttribute}}"/>
+        <click selector="{{AdminCreateProductConfigurationsPanel.createNewAttribute}}" stepKey="clickCreateNewAttribute" after="waitForNewAttributePageOpened"/>
+        <switchToIFrame selector="{{AdminNewAttributePanel.newAttributeIFrame}}" stepKey="enterAttributePanelIFrame" after="clickCreateNewAttribute"/>
+        <waitForElementVisible selector="{{AdminNewAttributePanel.defaultLabel}}" time="30" stepKey="waitForIframeLoad" after="enterAttributePanelIFrame"/>
+        <fillField selector="{{AdminNewAttributePanel.defaultLabel}}" userInput="{{productDropDownAttribute.attribute_code}}" stepKey="fillDefaultLabel" after="waitForIframeLoad"/>
+        <selectOption selector="{{AdminNewAttributePanel.inputType}}" userInput="{{colorProductAttribute.input_type}}" stepKey="selectAttributeInputType" after="fillDefaultLabel"/>
+        <!--Add option to attribute-->
+        <click selector="{{AdminNewAttributePanel.addOption}}" stepKey="clickAddOption1" after="selectAttributeInputType"/>
+        <waitForElementVisible selector="{{AdminNewAttributePanel.isDefault('1')}}" time="30" stepKey="waitForOptionRow1" after="clickAddOption1"/>
+        <fillField selector="{{AdminNewAttributePanel.optionAdminValue('0')}}" userInput="ThisIsLongNameNameLengthMoreThanSixtyFourThisIsLongNameNameLength" stepKey="fillAdminLabel1" after="waitForOptionRow1"/>
+        <fillField selector="{{AdminNewAttributePanel.optionDefaultStoreValue('0')}}" userInput="{{colorProductAttribute1.name}}" stepKey="fillDefaultLabel1" after="fillAdminLabel1"/>
+
+        <!--Save attribute-->
+        <click selector="{{AdminNewAttributePanel.saveAttribute}}" stepKey="clickOnNewAttributePanel"/>
+        <waitForPageLoad stepKey="waitForSaveAttribute"/>
+        <switchToIFrame stepKey="switchOutOfIFrame"/>
+
+        <!--Find attribute in grid and select-->
+        <conditionalClick selector="{{AdminDataGridHeaderSection.clearFilters}}" dependentSelector="{{AdminDataGridHeaderSection.clearFilters}}" visible="true" stepKey="clearExistingFilters"/>
+        <click selector="{{AdminDataGridHeaderSection.filters}}" stepKey="clickOnFilters"/>
+        <fillField selector="{{AdminDataGridHeaderSection.attributeCodeFilterInput}}" userInput="{{productDropDownAttribute.attribute_code}}" stepKey="fillFilterAttributeCodeField"/>
+        <click selector="{{AdminDataGridHeaderSection.applyFilters}}" stepKey="clickApplyFiltersButton"/>
+        <click selector="{{AdminDataGridTableSection.rowCheckbox('1')}}" stepKey="clickOnFirstCheckbox"/>
+        <click selector="{{AdminCreateProductConfigurationsPanel.next}}" stepKey="clickNextStep1"/>
+        <waitForElementVisible selector="{{AdminCreateProductConfigurationsPanel.selectAllByAttribute(productDropDownAttribute.attribute_code)}}" stepKey="waitForNextPageOpened"/>
+        <click selector="{{AdminCreateProductConfigurationsPanel.selectAllByAttribute(productDropDownAttribute.attribute_code)}}" stepKey="clickSelectAll"/>
+        <click selector="{{AdminCreateProductConfigurationsPanel.next}}" stepKey="clickNextStep2"/>
+        <waitForElementVisible selector="{{AdminCreateProductConfigurationsPanel.applySinglePriceToAllSkus}}" stepKey="waitForNextPageOpened2"/>
+        <click selector="{{AdminCreateProductConfigurationsPanel.applySinglePriceToAllSkus}}" stepKey="clickOnApplySinglePriceToAllSkus"/>
+        <fillField selector="{{AdminCreateProductConfigurationsPanel.singlePrice}}" userInput="10" stepKey="enterAttributePrice"/>
+        <click selector="{{AdminCreateProductConfigurationsPanel.applySingleQuantityToEachSkus}}" stepKey="clickOnApplySingleQuantityToEachSku"/>
+        <fillField selector="{{AdminCreateProductConfigurationsPanel.quantity}}" userInput="100" stepKey="enterAttributeQuantity"/>
+        <click selector="{{AdminCreateProductConfigurationsPanel.next}}" stepKey="clickOnNextStep3"/>
+        <waitForElementVisible selector="{{AdminCreateProductConfigurationsPanel.next}}" stepKey="waitForNextPageOpened3"/>
+        <click selector="{{AdminCreateProductConfigurationsPanel.next}}" stepKey="generateProducts"/>
+        <waitForElementVisible selector="{{AdminProductFormActionSection.saveButton}}" stepKey="waitForSaveButtonVisible"/>
+        <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="saveProduct"/>
+        <waitForElementVisible selector="{{AdminChooseAffectedAttributeSetPopup.confirm}}" stepKey="waitForPopUpVisible"/>
+        <click selector="{{AdminChooseAffectedAttributeSetPopup.confirm}}" stepKey="clickOnConfirmInPopup"/>
+        <dontSeeElement selector="{{AdminMessagesSection.success}}" stepKey="dontSeeSaveProductMessage"/>
+
+        <!--Close modal window-->
+        <click selector="{{AdminChooseAffectedAttributeSetPopup.closePopUp}}" stepKey="clickOnClosePopup"/>
+        <waitForElementNotVisible selector="{{AdminChooseAffectedAttributeSetPopup.closePopUp}}" stepKey="waitForDialogClosed"/>
+
+        <!--See that validation message is shown under the fields-->
+        <scrollTo selector="{{AdminProductFormConfigurationsSection.currentVariationsSkuCells}}" stepKey="scrollTConfigurationTab"/>
+        <see userInput="Please enter less or equal than 64 symbols." selector="{{AdminProductFormConfigurationsSection.confProductSkuMessage('0')}}" stepKey="SeeValidationMessage"/>
+
+        <!--Edit "SKU" with valid quantity-->
+        <fillField stepKey="fillValidValue" selector="{{AdminProductFormConfigurationsSection.confProductSku('0')}}" userInput="{{ApiConfigurableProduct.name}}-thisIsShortName"/>
+
+        <!--Click on "Save"-->
+        <waitForElementVisible selector="{{AdminProductFormActionSection.saveButton}}" stepKey="waitForSaveBtnVisible"/>
+        <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="saveProductAgain"/>
+
+        <!--Click on "Confirm". Product is saved, success message appears -->
+        <waitForElementVisible selector="{{AdminChooseAffectedAttributeSetPopup.confirm}}" stepKey="waitPopUpVisible"/>
+        <click selector="{{AdminChooseAffectedAttributeSetPopup.confirm}}" stepKey="clickOnConfirmPopup"/>
+        <seeElement selector="{{AdminMessagesSection.success}}" stepKey="seeSaveProductMessage"/>
+
+        <after>
+            <!--Delete created data-->
+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
+            <deleteData createDataKey="createConfigProduct" stepKey="deleteConfigProduct"/>
+            <actionGroup ref="deleteProductBySku" stepKey="deleteProduct">
+                <argument name="sku" value="{{ApiConfigurableProduct.name}}-thisIsShortName"/>
+            </actionGroup>
+            <conditionalClick selector="{{AdminProductGridFilterSection.clearFilters}}"
+                dependentSelector="{{AdminProductGridFilterSection.clearFilters}}" visible="true" stepKey="clickClearFilters"/>
+            <!-- Remove attribute -->
+            <actionGroup ref="deleteProductAttribute" stepKey="deleteAttribute">
+                <argument name="ProductAttribute" value="productDropDownAttribute"/>
+            </actionGroup>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+    </test>
+</tests>

From 764f7298953c4938abafaba499ec3d3b58a65a03 Mon Sep 17 00:00:00 2001
From: Yuliya Labudova <Yuliya_Labudova@epam.com>
Date: Mon, 5 Nov 2018 20:33:57 +0300
Subject: [PATCH 05/70] MAGETWO-96107: Additional blank option in country
 dropdown

- Delete blank line for single country
---
 .../Directory/Model/ResourceModel/Country/Collection.php       | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/code/Magento/Directory/Model/ResourceModel/Country/Collection.php b/app/code/Magento/Directory/Model/ResourceModel/Country/Collection.php
index 20140baae01b6..28d59c5338194 100644
--- a/app/code/Magento/Directory/Model/ResourceModel/Country/Collection.php
+++ b/app/code/Magento/Directory/Model/ResourceModel/Country/Collection.php
@@ -205,6 +205,7 @@ public function getItemById($countryId)
 
     /**
      * Add filter by country code to collection.
+     *
      * $countryCode can be either array of country codes or string representing one country code.
      * $iso can be either array containing 'iso2', 'iso3' values or string with containing one of that values directly.
      * The collection will contain countries where at least one of contry $iso fields matches $countryCode.
@@ -297,7 +298,7 @@ public function toOptionArray($emptyLabel = ' ')
             }
             $options[] = $option;
         }
-        if ($emptyLabel !== false && count($options) > 0) {
+        if ($emptyLabel !== false && count($options) > 1) {
             array_unshift($options, ['value' => '', 'label' => $emptyLabel]);
         }
 

From a9d2dfcb96568562edd03d62682a31bfcda09df8 Mon Sep 17 00:00:00 2001
From: Sona Sargsyan <sona_sargsyan@epam.com>
Date: Mon, 12 Nov 2018 17:28:07 +0400
Subject: [PATCH 06/70] MAGETWO-96107: Additional blank option in country
 dropdown

- Added automation test
---
 .../Mftf/Data/CountryOptionConfigData.xml     | 24 ++++++++++
 .../Metadata/system_config-countries-meta.xml | 35 ++++++++++++++
 ...untryDropDownWithOneAllowedCountryTest.xml | 48 +++++++++++++++++++
 3 files changed, 107 insertions(+)
 create mode 100644 app/code/Magento/Config/Test/Mftf/Data/CountryOptionConfigData.xml
 create mode 100644 app/code/Magento/Config/Test/Mftf/Metadata/system_config-countries-meta.xml
 create mode 100644 app/code/Magento/Config/Test/Mftf/Test/CheckingCountryDropDownWithOneAllowedCountryTest.xml

diff --git a/app/code/Magento/Config/Test/Mftf/Data/CountryOptionConfigData.xml b/app/code/Magento/Config/Test/Mftf/Data/CountryOptionConfigData.xml
new file mode 100644
index 0000000000000..641a0c8705d69
--- /dev/null
+++ b/app/code/Magento/Config/Test/Mftf/Data/CountryOptionConfigData.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
+    <entity name="EnableAdminAccountAllowCountry" type="admin_account_country_options_config">
+        <requiredEntity type="admin_account_country_options_value">AdminAccountAllowCountryUS</requiredEntity>
+    </entity>
+    <entity name="AdminAccountAllowCountryUS" type="admin_account_country_options_value">
+        <data key="value">US</data>
+    </entity>
+
+    <entity name="DisableAdminAccountAllowCountry" type="default_admin_account_country_options_config">
+        <requiredEntity type="checkoutTotalFlagZero">DefaultAdminAccountAllowCountry</requiredEntity>
+    </entity>
+    <entity name="DefaultAdminAccountAllowCountry" type="checkoutTotalFlagZero">
+        <data key="value">0</data>
+    </entity>
+</entities>
diff --git a/app/code/Magento/Config/Test/Mftf/Metadata/system_config-countries-meta.xml b/app/code/Magento/Config/Test/Mftf/Metadata/system_config-countries-meta.xml
new file mode 100644
index 0000000000000..d0935bdca4822
--- /dev/null
+++ b/app/code/Magento/Config/Test/Mftf/Metadata/system_config-countries-meta.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<operations xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+            xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataOperation.xsd">
+    <operation name="AdminAccountCountryOptionConfig" dataType="admin_account_country_options_config" type="create" auth="adminFormKey" url="/admin/system_config/save/section/general/" method="POST">
+        <object key="groups" dataType="admin_account_country_options_config">
+            <object key="country" dataType="admin_account_country_options_config">
+                 <object key="fields" dataType="admin_account_country_options_config">
+                    <object key="allow" dataType="admin_account_country_options_value">
+                        <field key="value">string</field>
+                    </object>
+                 </object>
+            </object>
+        </object>
+    </operation>
+
+    <operation name="DefaultAdminAccountCountryOptionConfig" dataType="default_admin_account_country_options_config" type="create" auth="adminFormKey" url="/admin/system_config/save/section/general/" method="POST">
+        <object key="groups" dataType="default_admin_account_country_options_config">
+            <object key="country" dataType="default_admin_account_country_options_config">
+                <object key="fields" dataType="default_admin_account_country_options_config">
+                    <object key="allow" dataType="default_admin_account_country_options_config">
+                        <object key="inherit" dataType="checkoutTotalFlagZero">
+                            <field key="value">string</field>
+                        </object>
+                    </object>
+                </object>
+            </object>
+        </object>
+    </operation>
+</operations>
diff --git a/app/code/Magento/Config/Test/Mftf/Test/CheckingCountryDropDownWithOneAllowedCountryTest.xml b/app/code/Magento/Config/Test/Mftf/Test/CheckingCountryDropDownWithOneAllowedCountryTest.xml
new file mode 100644
index 0000000000000..7b4cf8eb40c24
--- /dev/null
+++ b/app/code/Magento/Config/Test/Mftf/Test/CheckingCountryDropDownWithOneAllowedCountryTest.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="CheckingCountryDropDownWithOneAllowedCountryTest">
+        <annotations>
+            <features value="Backend"/>
+            <stories value="Dynamic Media URL"/>
+            <title value="Verify that Allow Dynamic Media URLs setting is removed from configuration page"/>
+            <description value="Verify that Allow Dynamic Media URLs setting is removed from configuration page"/>
+            <severity value="CRITICAL"/>
+            <useCaseId value="MC-1387564"/>
+            <testCaseId value="MC-3185678"/>
+            <group value="configuration"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+            <createData entity="EnableAdminAccountAllowCountry" stepKey="setAllowedCountries"/>
+
+        </before>
+        <after>
+            <createData entity="DisableAdminAccountAllowCountry" stepKey="setDefaultValueForAllowCountries"/>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+
+         <!--Flush Magento Cache-->
+        <magentoCLI stepKey="flushCache" command="cache:flush"/>
+
+         <!--Create a customer account from Storefront-->
+        <actionGroup ref="SignUpNewUserFromStorefrontActionGroup" stepKey="createAnAccount">
+            <argument name="Customer" value="CustomerEntityOne"/>
+        </actionGroup>
+        <click selector="{{CheckoutPaymentSection.addressBook}}" stepKey="goToAddressBook"/>
+        <wait time="20" stepKey="kk"/>
+
+        <click selector="{{StorefrontCustomerAddressSection.country}}" stepKey="clickToExpandCountryDropDown"/>
+        <see selector="{{StorefrontCustomerAddressSection.country}}" userInput="United States" stepKey="seeSelectedCountry"/>
+        <dontSee selector="{{StorefrontCustomerAddressSection.country}}" userInput="Brazil" stepKey="canNotSeeSelectedCountry"/>
+    </test>
+</tests>
+
+

From 43e80e77d967430d0c9fb0dbf812daca95b3d6b4 Mon Sep 17 00:00:00 2001
From: Sona Sargsyan <sona_sargsyan@epam.com>
Date: Mon, 12 Nov 2018 18:18:15 +0400
Subject: [PATCH 07/70] MAGETWO-96107: Additional blank option in country
 dropdown

- Added some corrections to automation test
---
 .../Mftf/Data/CountryOptionConfigData.xml     |  2 +-
 .../Metadata/system_config-countries-meta.xml |  2 +-
 ...untryDropDownWithOneAllowedCountryTest.xml | 20 ++++++-------------
 3 files changed, 8 insertions(+), 16 deletions(-)

diff --git a/app/code/Magento/Config/Test/Mftf/Data/CountryOptionConfigData.xml b/app/code/Magento/Config/Test/Mftf/Data/CountryOptionConfigData.xml
index 641a0c8705d69..53ca46e746206 100644
--- a/app/code/Magento/Config/Test/Mftf/Data/CountryOptionConfigData.xml
+++ b/app/code/Magento/Config/Test/Mftf/Data/CountryOptionConfigData.xml
@@ -7,7 +7,7 @@
 -->
 
 <entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
     <entity name="EnableAdminAccountAllowCountry" type="admin_account_country_options_config">
         <requiredEntity type="admin_account_country_options_value">AdminAccountAllowCountryUS</requiredEntity>
     </entity>
diff --git a/app/code/Magento/Config/Test/Mftf/Metadata/system_config-countries-meta.xml b/app/code/Magento/Config/Test/Mftf/Metadata/system_config-countries-meta.xml
index d0935bdca4822..bd16c225af51d 100644
--- a/app/code/Magento/Config/Test/Mftf/Metadata/system_config-countries-meta.xml
+++ b/app/code/Magento/Config/Test/Mftf/Metadata/system_config-countries-meta.xml
@@ -6,7 +6,7 @@
   */
 -->
 <operations xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-            xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataOperation.xsd">
+            xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataOperation.xsd">
     <operation name="AdminAccountCountryOptionConfig" dataType="admin_account_country_options_config" type="create" auth="adminFormKey" url="/admin/system_config/save/section/general/" method="POST">
         <object key="groups" dataType="admin_account_country_options_config">
             <object key="country" dataType="admin_account_country_options_config">
diff --git a/app/code/Magento/Config/Test/Mftf/Test/CheckingCountryDropDownWithOneAllowedCountryTest.xml b/app/code/Magento/Config/Test/Mftf/Test/CheckingCountryDropDownWithOneAllowedCountryTest.xml
index 7b4cf8eb40c24..728b4be805a13 100644
--- a/app/code/Magento/Config/Test/Mftf/Test/CheckingCountryDropDownWithOneAllowedCountryTest.xml
+++ b/app/code/Magento/Config/Test/Mftf/Test/CheckingCountryDropDownWithOneAllowedCountryTest.xml
@@ -10,39 +10,31 @@
        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
     <test name="CheckingCountryDropDownWithOneAllowedCountryTest">
         <annotations>
-            <features value="Backend"/>
-            <stories value="Dynamic Media URL"/>
-            <title value="Verify that Allow Dynamic Media URLs setting is removed from configuration page"/>
-            <description value="Verify that Allow Dynamic Media URLs setting is removed from configuration page"/>
-            <severity value="CRITICAL"/>
-            <useCaseId value="MC-1387564"/>
-            <testCaseId value="MC-3185678"/>
+            <features value="Config"/>
+            <stories value="MAGETWO-96107: Additional blank option in country dropdown"/>
+            <title value="Checking country drop-down with one allowed country"/>
+            <description value="Check country drop-down with one allowed country"/>
+            <severity value="MAJOR"/>
+            <testCaseId value="MAGETWO-96133"/>
             <group value="configuration"/>
         </annotations>
         <before>
             <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
             <createData entity="EnableAdminAccountAllowCountry" stepKey="setAllowedCountries"/>
-
         </before>
         <after>
             <createData entity="DisableAdminAccountAllowCountry" stepKey="setDefaultValueForAllowCountries"/>
             <actionGroup ref="logout" stepKey="logout"/>
         </after>
-
          <!--Flush Magento Cache-->
         <magentoCLI stepKey="flushCache" command="cache:flush"/>
-
          <!--Create a customer account from Storefront-->
         <actionGroup ref="SignUpNewUserFromStorefrontActionGroup" stepKey="createAnAccount">
             <argument name="Customer" value="CustomerEntityOne"/>
         </actionGroup>
         <click selector="{{CheckoutPaymentSection.addressBook}}" stepKey="goToAddressBook"/>
-        <wait time="20" stepKey="kk"/>
-
         <click selector="{{StorefrontCustomerAddressSection.country}}" stepKey="clickToExpandCountryDropDown"/>
         <see selector="{{StorefrontCustomerAddressSection.country}}" userInput="United States" stepKey="seeSelectedCountry"/>
         <dontSee selector="{{StorefrontCustomerAddressSection.country}}" userInput="Brazil" stepKey="canNotSeeSelectedCountry"/>
     </test>
 </tests>
-
-

From 5727f089e96b873b01ad93d656dc1c16cb0ecac5 Mon Sep 17 00:00:00 2001
From: Mikalai Shostka <mikalai_shostka@epam.com>
Date: Fri, 23 Nov 2018 13:22:49 +0300
Subject: [PATCH 08/70] MAGETWO-96409: [2.3.x] [MAGENTO CLOUD] Unable to add
 more attributes in size

- Add min width for columns
---
 .../templates/catalog/product/attribute/text.phtml          | 6 +++---
 .../Magento/Swatches/view/adminhtml/web/css/swatches.css    | 4 ++++
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/app/code/Magento/Swatches/view/adminhtml/templates/catalog/product/attribute/text.phtml b/app/code/Magento/Swatches/view/adminhtml/templates/catalog/product/attribute/text.phtml
index 8d4400b3d0477..e00c41d371c9e 100644
--- a/app/code/Magento/Swatches/view/adminhtml/templates/catalog/product/attribute/text.phtml
+++ b/app/code/Magento/Swatches/view/adminhtml/templates/catalog/product/attribute/text.phtml
@@ -21,7 +21,7 @@ $stores = $block->getStoresSortedBySortOrder();
                 <th class="col-draggable"></th>
                 <th class="col-default"><span><?= $block->escapeHtml(__('Is Default')) ?></span></th>
                 <?php foreach ($stores as $_store): ?>
-                    <th class="col-swatch col-<%- data.id %>
+                    <th class="col-swatch col-swatch-min-width col-<%- data.id %>
                         <?php if ($_store->getId() == \Magento\Store\Model\Store::DEFAULT_STORE_ID): ?> _required<?php endif; ?>"
                         colspan="2">
                         <span><?= $block->escapeHtml($_store->getName()) ?></span>
@@ -75,7 +75,7 @@ $stores = $block->getStoresSortedBySortOrder();
             </td>
             <?php foreach ($stores as $_store): ?>
                 <?php $storeId = (int)$_store->getId(); ?>
-                <td class="col-swatch col-<%- data.id %>">
+                <td class="col-swatch col-swatch-min-width col-<%- data.id %>">
                     <input class="input-text
                         swatch-text-field-<?= /* @noEscape */ $storeId ?>
                         <?php if ($storeId == \Magento\Store\Model\Store::DEFAULT_STORE_ID): ?> required-option required-unique<?php endif; ?>"
@@ -83,7 +83,7 @@ $stores = $block->getStoresSortedBySortOrder();
                            type="text" value="<%- data.swatch<?= /* @noEscape */ $storeId ?> %>"
                            placeholder="<?= $block->escapeHtml(__("Swatch")) ?>"/>
                 </td>
-                <td class="swatch-col-<%- data.id %>">
+                <td class="col-swatch-min-width swatch-col-<%- data.id %>">
                     <input name="optiontext[value][<%- data.id %>][<?= /* @noEscape */ $storeId ?>]"
                            value="<%- data.store<?= /* @noEscape */ $storeId ?> %>"
                            class="input-text<?php if ($storeId == \Magento\Store\Model\Store::DEFAULT_STORE_ID): ?> required-option<?php endif; ?>"
diff --git a/app/code/Magento/Swatches/view/adminhtml/web/css/swatches.css b/app/code/Magento/Swatches/view/adminhtml/web/css/swatches.css
index d170ed0345a03..1383634ef424c 100644
--- a/app/code/Magento/Swatches/view/adminhtml/web/css/swatches.css
+++ b/app/code/Magento/Swatches/view/adminhtml/web/css/swatches.css
@@ -149,6 +149,10 @@
     width: 50px;
 }
 
+.col-swatch-min-width {
+    min-width: 30px;
+}
+
 .swatches-visual-col.unavailable:after {
     content: '';
     position: absolute;

From ee1c1cc0cba9f3ecb0c654a8ccdd1c740044855d Mon Sep 17 00:00:00 2001
From: Alexey Yakimovich <yakimovich@almagy.com>
Date: Tue, 27 Nov 2018 12:23:51 +0300
Subject: [PATCH 09/70] MAGETWO-91640: Import of Products fails on error when
 errors should be skipped

- Added warning message with skipped errors count information;
---
 .../Magento/ImportExport/Model/Import.php     | 20 ++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

diff --git a/app/code/Magento/ImportExport/Model/Import.php b/app/code/Magento/ImportExport/Model/Import.php
index 064c696ad0a84..27217dfd9908d 100644
--- a/app/code/Magento/ImportExport/Model/Import.php
+++ b/app/code/Magento/ImportExport/Model/Import.php
@@ -7,9 +7,11 @@
 namespace Magento\ImportExport\Model;
 
 use Magento\Framework\App\Filesystem\DirectoryList;
+use Magento\Framework\App\ObjectManager;
 use Magento\Framework\HTTP\Adapter\FileTransferFactory;
 use Magento\ImportExport\Model\Import\ErrorProcessing\ProcessingError;
 use Magento\ImportExport\Model\Import\ErrorProcessing\ProcessingErrorAggregatorInterface;
+use Magento\Framework\Message\ManagerInterface;
 
 /**
  * Import model
@@ -167,6 +169,11 @@ class Import extends \Magento\ImportExport\Model\AbstractModel
      */
     protected $_filesystem;
 
+    /**
+     * @var ManagerInterface
+     */
+    private $messageManager;
+
     /**
      * @param \Psr\Log\LoggerInterface $logger
      * @param \Magento\Framework\Filesystem $filesystem
@@ -183,6 +190,7 @@ class Import extends \Magento\ImportExport\Model\AbstractModel
      * @param History $importHistoryModel
      * @param \Magento\Framework\Stdlib\DateTime\DateTime $localeDate
      * @param array $data
+     * @param ManagerInterface|null $messageManager
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
@@ -200,7 +208,8 @@ public function __construct(
         \Magento\Framework\Indexer\IndexerRegistry $indexerRegistry,
         \Magento\ImportExport\Model\History $importHistoryModel,
         \Magento\Framework\Stdlib\DateTime\DateTime $localeDate,
-        array $data = []
+        array $data = [],
+        ManagerInterface $messageManager = null
     ) {
         $this->_importExportData = $importExportData;
         $this->_coreConfig = $coreConfig;
@@ -215,6 +224,7 @@ public function __construct(
         $this->_filesystem = $filesystem;
         $this->importHistoryModel = $importHistoryModel;
         $this->localeDate = $localeDate;
+        $this->messageManager = $messageManager ?: ObjectManager::getInstance()->get(ManagerInterface::class);
         parent::__construct($logger, $filesystem, $data);
     }
 
@@ -588,9 +598,13 @@ public function validateSource(\Magento\ImportExport\Model\Import\AbstractSource
         $messages = $this->getOperationResultMessages($errorAggregator);
         $this->addLogComment($messages);
 
-        $result = !$errorAggregator->getErrorsCount();
+        $errorsCount = $errorAggregator->getErrorsCount();
+        $result = !$errorsCount;
         $validationStrategy = $this->getData(self::FIELD_NAME_VALIDATION_STRATEGY);
-        if ($validationStrategy === ProcessingErrorAggregatorInterface::VALIDATION_STRATEGY_SKIP_ERRORS) {
+        if ($errorsCount
+            && $validationStrategy === ProcessingErrorAggregatorInterface::VALIDATION_STRATEGY_SKIP_ERRORS
+        ) {
+            $this->messageManager->addWarningMessage(sprintf(__('Skipped errors: %d'), $errorsCount));
             $result = true;
         }
 

From 2cab2ec543a6b4bcbc6220367878e73584c70184 Mon Sep 17 00:00:00 2001
From: Sona Sargsyan <sona_sargsyan@epam.com>
Date: Wed, 28 Nov 2018 13:38:06 +0400
Subject: [PATCH 10/70] MAGETWO-96107: Additional blank option in country
 dropdown

- Added some corrections based on comments
---
 ...kingCountryDropDownWithOneAllowedCountryTest.xml |  7 ++++++-
 .../OpenEditCustomerFromAdminActionGroup.xml        | 13 +++++++++++++
 2 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/app/code/Magento/Config/Test/Mftf/Test/CheckingCountryDropDownWithOneAllowedCountryTest.xml b/app/code/Magento/Config/Test/Mftf/Test/CheckingCountryDropDownWithOneAllowedCountryTest.xml
index 728b4be805a13..af620ea2d2ade 100644
--- a/app/code/Magento/Config/Test/Mftf/Test/CheckingCountryDropDownWithOneAllowedCountryTest.xml
+++ b/app/code/Magento/Config/Test/Mftf/Test/CheckingCountryDropDownWithOneAllowedCountryTest.xml
@@ -19,11 +19,16 @@
             <group value="configuration"/>
         </annotations>
         <before>
-            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
             <createData entity="EnableAdminAccountAllowCountry" stepKey="setAllowedCountries"/>
         </before>
         <after>
             <createData entity="DisableAdminAccountAllowCountry" stepKey="setDefaultValueForAllowCountries"/>
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+            <actionGroup ref="DeleteCustomerAdminActionGroup" stepKey="deleteCustomer">
+                <argument name="customer" value="CustomerEntityOne"/>
+            </actionGroup>
+            <actionGroup ref="AdminClearCustomersFiltersActionGroup" stepKey="clearFilters"/>
+            <waitForPageLoad stepKey="WaitForPageToLoad"/>
             <actionGroup ref="logout" stepKey="logout"/>
         </after>
          <!--Flush Magento Cache-->
diff --git a/app/code/Magento/Customer/Test/Mftf/ActionGroup/OpenEditCustomerFromAdminActionGroup.xml b/app/code/Magento/Customer/Test/Mftf/ActionGroup/OpenEditCustomerFromAdminActionGroup.xml
index 5b3a7a70aa2e6..b727c6f77d203 100755
--- a/app/code/Magento/Customer/Test/Mftf/ActionGroup/OpenEditCustomerFromAdminActionGroup.xml
+++ b/app/code/Magento/Customer/Test/Mftf/ActionGroup/OpenEditCustomerFromAdminActionGroup.xml
@@ -35,8 +35,21 @@
         <click selector="{{AdminCustomerGridMainActionsSection.delete}}" stepKey="clickDelete"/>
         <waitForAjaxLoad stepKey="waitForLoadConfirmation"/>
         <click selector="{{AdminConfirmationModalSection.ok}}" stepKey="confirmDelete"/>
+        <wait time="5" stepKey="aaa"/>
         <see selector="{{AdminMessagesSection.successMessage}}" userInput="A total of 1 record(s) were deleted" stepKey="seeSuccess"/>
     </actionGroup>
+
+    <actionGroup name="DeleteCustomerAdminActionGroup" extends="DeleteCustomerFromAdminActionGroup">
+        <arguments>
+            <argument name="customer"/>
+        </arguments>
+        <remove keyForRemoval="fillSearch"/>
+        <remove keyForRemoval="clickSubmit"/>
+        <click selector="{{AdminDataGridHeaderSection.filters}}" stepKey="openFiltersSectionOnCustomerPage" after="clickOnButtonToRemoveFiltersIfPresent"/>
+        <fillField userInput="{{customer.email}}" selector="{{AdminDataGridHeaderSection.filterFieldInput('email')}}" stepKey="fillEmailOnFiltersSection" after="openFiltersSectionOnCustomerPage"/>
+        <click selector="{{AdminDataGridHeaderSection.applyFilters}}" stepKey="clickApplyFiltersButton" after="fillEmailOnFiltersSection"/>
+    </actionGroup>
+
     <actionGroup name="AdminClearCustomersFiltersActionGroup">
         <amOnPage url="{{AdminCustomerPage.url}}" stepKey="amOnCustomersPage"/>
         <waitForPageLoad stepKey="WaitForPageToLoad"/>

From dfe294622548712c71368f1fa6caa0fd711d0cbe Mon Sep 17 00:00:00 2001
From: Nikita Chubukov <nikita_chubukov@epam.com>
Date: Wed, 28 Nov 2018 15:52:07 +0300
Subject: [PATCH 11/70] MAGETWO-96413: Restricted Admin User Backend Order
 Creation Issue

- Added condition to definition current currency code
---
 app/code/Magento/Store/Model/Store.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/app/code/Magento/Store/Model/Store.php b/app/code/Magento/Store/Model/Store.php
index c92d62cd0bbe3..3caaf7837947d 100644
--- a/app/code/Magento/Store/Model/Store.php
+++ b/app/code/Magento/Store/Model/Store.php
@@ -889,7 +889,10 @@ public function setCurrentCurrencyCode($code)
         if (in_array($code, $this->getAvailableCurrencyCodes())) {
             $this->_getSession()->setCurrencyCode($code);
 
-            $defaultCode = $this->_storeManager->getWebsite()->getDefaultStore()->getDefaultCurrency()->getCode();
+            $defaultCode = ($this->_storeManager->getStore() !== null)
+                ? $this->_storeManager->getStore()->getDefaultCurrency()->getCode()
+                : $this->_storeManager->getWebsite()->getDefaultStore()->getDefaultCurrency()->getCode();
+            
             $this->_httpContext->setValue(Context::CONTEXT_CURRENCY, $code, $defaultCode);
         }
         return $this;

From 6f5a212b32b4f26c4825fc6d9be2dd44d70d6abc Mon Sep 17 00:00:00 2001
From: David Grigoryan <david_grigoryan@epam.com>
Date: Thu, 29 Nov 2018 10:29:57 +0400
Subject: [PATCH 12/70] MAGETWO-95834: Unable to create Configurations for
 Configurable Products

- Updated automated test
---
 ...nCheckValidatorConfigurableProductTest.xml | 34 +++++++++----------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminCheckValidatorConfigurableProductTest.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminCheckValidatorConfigurableProductTest.xml
index 44ab6e2e8e04f..2c331fa05efd7 100644
--- a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminCheckValidatorConfigurableProductTest.xml
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminCheckValidatorConfigurableProductTest.xml
@@ -11,11 +11,11 @@
     <test name="AdminCheckValidatorConfigurableProductTest">
         <annotations>
             <features value="ConfigurableProduct"/>
-            <stories value="MAGETWO-95834: Unable to create Configurations for Configurable Products"/>
             <title value="Check that validator works correctly when creating Configurations for Configurable Products"/>
             <description value="Verify validator works correctly for Configurable Products"/>
             <severity value="MAJOR"/>
             <testCaseId value="MAGETWO-95995"/>
+            <useCaseId value="MAGETWO-95834"/>
             <group value="ConfigurableProduct"/>
         </annotations>
 
@@ -30,6 +30,22 @@
             </createData>
         </before>
 
+        <after>
+            <!--Delete created data-->
+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
+            <deleteData createDataKey="createConfigProduct" stepKey="deleteConfigProduct"/>
+            <actionGroup ref="deleteProductBySku" stepKey="deleteProduct">
+                <argument name="sku" value="{{ApiConfigurableProduct.name}}-thisIsShortName"/>
+            </actionGroup>
+            <conditionalClick selector="{{AdminProductGridFilterSection.clearFilters}}"
+                              dependentSelector="{{AdminProductGridFilterSection.clearFilters}}" visible="true" stepKey="clickClearFilters"/>
+            <!-- Remove attribute -->
+            <actionGroup ref="deleteProductAttribute" stepKey="deleteAttribute">
+                <argument name="ProductAttribute" value="productDropDownAttribute"/>
+            </actionGroup>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+
         <!-- Find the product that we just created using the product grid -->
         <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="visitAdminProductPage"/>
         <waitForPageLoad stepKey="waitForAdminProductPageLoad"/>
@@ -106,21 +122,5 @@
         <waitForElementVisible selector="{{AdminChooseAffectedAttributeSetPopup.confirm}}" stepKey="waitPopUpVisible"/>
         <click selector="{{AdminChooseAffectedAttributeSetPopup.confirm}}" stepKey="clickOnConfirmPopup"/>
         <seeElement selector="{{AdminMessagesSection.success}}" stepKey="seeSaveProductMessage"/>
-
-        <after>
-            <!--Delete created data-->
-            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
-            <deleteData createDataKey="createConfigProduct" stepKey="deleteConfigProduct"/>
-            <actionGroup ref="deleteProductBySku" stepKey="deleteProduct">
-                <argument name="sku" value="{{ApiConfigurableProduct.name}}-thisIsShortName"/>
-            </actionGroup>
-            <conditionalClick selector="{{AdminProductGridFilterSection.clearFilters}}"
-                dependentSelector="{{AdminProductGridFilterSection.clearFilters}}" visible="true" stepKey="clickClearFilters"/>
-            <!-- Remove attribute -->
-            <actionGroup ref="deleteProductAttribute" stepKey="deleteAttribute">
-                <argument name="ProductAttribute" value="productDropDownAttribute"/>
-            </actionGroup>
-            <actionGroup ref="logout" stepKey="logout"/>
-        </after>
     </test>
 </tests>

From e5bdad1a6e08d5b936b2165f5053bb5920ffc314 Mon Sep 17 00:00:00 2001
From: Alexey Yakimovich <yakimovich@almagy.com>
Date: Wed, 21 Nov 2018 16:14:08 +0300
Subject: [PATCH 13/70] MAGETWO-96428: [2.3.x] App:config:dump doesn't lock all
 the settings in Magento backend

- Fixed an issue with not disabled settings after dump was processed;
---
 lib/internal/Magento/Framework/App/DeploymentConfig.php | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/lib/internal/Magento/Framework/App/DeploymentConfig.php b/lib/internal/Magento/Framework/App/DeploymentConfig.php
index 615c295675adc..40b03b068d6ab 100644
--- a/lib/internal/Magento/Framework/App/DeploymentConfig.php
+++ b/lib/internal/Magento/Framework/App/DeploymentConfig.php
@@ -70,6 +70,11 @@ public function get($key = null, $defaultValue = null)
         if ($key === null) {
             return $this->flatData;
         }
+
+        if (array_key_exists($key, $this->flatData) && $this->flatData[$key] === null) {
+            return '';
+        }
+
         return $this->flatData[$key] ?? $defaultValue;
     }
 
@@ -146,6 +151,8 @@ private function load()
     }
 
     /**
+     * Array keys conversion
+     *
      * Convert associative array of arbitrary depth to a flat associative array with concatenated key path as keys
      * each level of array is accessible by path key
      *

From 9b4d1e62e256cb08809a174f129a48647198ae06 Mon Sep 17 00:00:00 2001
From: David Grigoryan <david_grigoryan@epam.com>
Date: Thu, 29 Nov 2018 14:45:31 +0400
Subject: [PATCH 14/70] MAGETWO-95837: Product is added to Wish List with
 Attributes selected however they were unselected on PDP before

- Updated automated test
---
 ...ddToCartWishListWithUnselectedAttrTest.xml | 26 +++++++++----------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/app/code/Magento/Wishlist/Test/Mftf/Test/ConfProdAddToCartWishListWithUnselectedAttrTest.xml b/app/code/Magento/Wishlist/Test/Mftf/Test/ConfProdAddToCartWishListWithUnselectedAttrTest.xml
index f29fb5ee6f34a..6669e90c8d3e3 100644
--- a/app/code/Magento/Wishlist/Test/Mftf/Test/ConfProdAddToCartWishListWithUnselectedAttrTest.xml
+++ b/app/code/Magento/Wishlist/Test/Mftf/Test/ConfProdAddToCartWishListWithUnselectedAttrTest.xml
@@ -10,12 +10,12 @@
     <test name="ConfProdAddToCartWishListWithUnselectedAttrTest">
         <annotations>
             <features value="Wishlist"/>
-            <stories value="MAGETWO-95837: Product is added to Wish List with Attributes selected however they were unselected on PDP before"/>
             <group value="wishlist"/>
             <title value="Adding configurable product to Cart from Wish List with unselected attributes"/>
             <description value="Verify adding configurable product to Cart from Wish List when attributes is unselected"/>
             <severity value="AVERAGE"/>
             <testCaseId value="MAGETWO-95897"/>
+            <useCaseId value="MAGETWO-95837"/>
         </annotations>
 
         <before>
@@ -28,6 +28,17 @@
             </actionGroup>
             <createData entity="Simple_US_Customer" stepKey="createCustomer"/>
         </before>
+        <after>
+            <deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/>
+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
+            <!-- Delete the first simple product -->
+            <actionGroup stepKey="deleteProduct1" ref="deleteProductBySku">
+                <argument name="sku" value="{{_defaultProduct.sku}}"/>
+            </actionGroup>
+            <conditionalClick selector="{{AdminProductGridFilterSection.clearFilters}}"
+                              dependentSelector="{{AdminProductGridFilterSection.clearFilters}}" visible="true" stepKey="clickClearFilters"/>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
 
         <!--Login as customer -->
         <actionGroup ref="LoginToStorefrontActionGroup" stepKey="loginToStorefrontAccount">
@@ -49,21 +60,10 @@
         <waitForPageLoad stepKey="waitForLoading"/>
         <!--Click "Add All to Cart" button-->
         <click selector="{{StorefrontCustomerWishlistProductSection.ProductAddAllToCart}}" stepKey="addAllToCart"/>
+        <waitForElementVisible stepKey="waitForErrorAppears" selector="{{StorefrontMessagesSection.error}}"/>
 
         <!--Assert Correct Error Message-->
         <see userInput="You need to choose options for your item for" stepKey="assertCorrectErrorMessage"/>
         <dontSee userInput="1 product(s) have been added to shopping cart" stepKey="dontSeeSuccessMessage"/>
-
-        <after>
-            <deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/>
-            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
-            <!-- Delete the first simple product -->
-            <actionGroup stepKey="deleteProduct1" ref="deleteProductBySku">
-                <argument name="sku" value="{{_defaultProduct.sku}}"/>
-            </actionGroup>
-            <conditionalClick selector="{{AdminProductGridFilterSection.clearFilters}}"
-                              dependentSelector="{{AdminProductGridFilterSection.clearFilters}}" visible="true" stepKey="clickClearFilters"/>
-            <actionGroup ref="logout" stepKey="logout"/>
-        </after>
     </test>
 </tests>

From ea95d98e99b36d47458d049a47f0b7f94510b742 Mon Sep 17 00:00:00 2001
From: Lusine <lusine_papyan@epam.com>
Date: Fri, 30 Nov 2018 09:49:47 +0400
Subject: [PATCH 15/70] MAGETWO-96413: Restricted Admin User Backend Order
 Creation Issue

- Add automated test script
---
 ...omerWithWebsiteAndStoreViewActionGroup.xml | 21 +++++++++++++++++++
 .../ActionGroup/AdminOrderActionGroup.xml     |  8 +++++++
 .../AdminCreateStoreGroupActionGroup.xml      | 18 ++++++++++++++++
 3 files changed, 47 insertions(+)

diff --git a/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminCreateCustomerWithWebsiteAndStoreViewActionGroup.xml b/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminCreateCustomerWithWebsiteAndStoreViewActionGroup.xml
index 0071acf2ef1e0..2c6410f7d45cd 100644
--- a/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminCreateCustomerWithWebsiteAndStoreViewActionGroup.xml
+++ b/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminCreateCustomerWithWebsiteAndStoreViewActionGroup.xml
@@ -40,4 +40,25 @@
         <waitForPageLoad stepKey="waitForCustomersPage"/>
         <see stepKey="seeSuccessMessage" userInput="You saved the customer."/>
     </actionGroup>
+
+    <actionGroup name="AdminCreateCustomerWithWebSiteAndGroup">
+        <arguments>
+            <argument name="customerData" defaultValue="Simple_US_Customer"/>
+            <argument name="website" type="string" defaultValue="customWebsite"/>
+            <argument name="storeView" type="string" defaultValue="customStore"/>
+        </arguments>
+        <amOnPage url="{{AdminCustomerPage.url}}" stepKey="goToCustomersPage"/>
+        <click stepKey="addNewCustomer" selector="{{AdminCustomerGridMainActionsSection.addNewCustomer}}"/>
+        <selectOption stepKey="selectWebSite" selector="{{AdminCustomerAccountInformationSection.associateToWebsite}}" userInput="{{website}}"/>
+        <fillField stepKey="FillFirstName" selector="{{AdminCustomerAccountInformationSection.firstName}}" userInput="{{customerData.firstname}}"/>
+        <fillField stepKey="FillLastName" selector="{{AdminCustomerAccountInformationSection.lastName}}" userInput="{{customerData.lastname}}"/>
+        <fillField stepKey="FillEmail" selector="{{AdminCustomerAccountInformationSection.email}}" userInput="{{customerData.email}}"/>
+        <selectOption stepKey="selectStoreView" selector="{{AdminCustomerAccountInformationSection.storeView}}" userInput="{{storeView}}"/>
+        <click selector="{{AdminCustomerAccountInformationSection.group}}" stepKey="ClickToExpandGroup"/>
+        <waitForElement selector="{{AdminProductFormAdvancedPricingSection.productTierPriceGroupOrCatalogOption('Default (General)')}}" stepKey="waitForCustomerGroupExpand"/>
+        <click selector="{{AdminCustomerAccountInformationSection.groupValue('Default (General)')}}" after="waitForCustomerGroupExpand" stepKey="ClickToSelectGroup"/>
+        <click stepKey="save" selector="{{AdminCustomerAccountInformationSection.saveCustomer}}"/>
+        <waitForPageLoad stepKey="waitForCustomersPage"/>
+        <see stepKey="seeSuccessMessage" userInput="You saved the customer."/>
+    </actionGroup>
 </actionGroups>
diff --git a/app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminOrderActionGroup.xml b/app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminOrderActionGroup.xml
index cc8a62ca48961..e3655daca4806 100644
--- a/app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminOrderActionGroup.xml
+++ b/app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminOrderActionGroup.xml
@@ -320,4 +320,12 @@
         <see selector="{{AdminMessagesSection.success}}" userInput="You canceled the order." stepKey="seeCancelSuccessMessage"/>
         <see selector="{{AdminOrderDetailsInformationSection.orderStatus}}" userInput="Canceled" stepKey="seeOrderStatusCanceled"/>
     </actionGroup>
+
+    <actionGroup name="NavigateToNewOrderPageExistingCustomerAndStoreActionGroup" extends="navigateToNewOrderPageExistingCustomer" >
+        <arguments>
+            <argument name="storeView" defaultValue="_defaultStore"/>
+        </arguments>
+        <click selector="{{AdminOrderStoreScopeTreeSection.storeOption(storeView.name)}}" stepKey="selectStoreView" after="waitForCreateOrderPageLoad"/>
+        <waitForPageLoad stepKey="waitForLoad" after="selectStoreView"/>
+    </actionGroup>
 </actionGroups>
\ No newline at end of file
diff --git a/app/code/Magento/Store/Test/Mftf/ActionGroup/AdminCreateStoreGroupActionGroup.xml b/app/code/Magento/Store/Test/Mftf/ActionGroup/AdminCreateStoreGroupActionGroup.xml
index b21c79692a7cf..50ed5a28a4e81 100644
--- a/app/code/Magento/Store/Test/Mftf/ActionGroup/AdminCreateStoreGroupActionGroup.xml
+++ b/app/code/Magento/Store/Test/Mftf/ActionGroup/AdminCreateStoreGroupActionGroup.xml
@@ -23,4 +23,22 @@
         <waitForElementVisible selector="{{AdminStoresGridSection.storeFilterTextField}}" stepKey="waitForPageReload"/>
         <see userInput="You saved the store." stepKey="seeSavedMessage" />
     </actionGroup>
+
+    <actionGroup name="AdminAddCustomWebSiteToStoreGroup">
+        <arguments>
+            <argument name="storeGroup" defaultValue="customStoreGroup"/>
+            <argument name="website" defaultValue="customWebsite"/>
+        </arguments>
+        <amOnPage url="{{AdminSystemStorePage.url}}" stepKey="amOnAdminSystemStorePage"/>
+        <click selector="{{AdminStoresGridSection.resetButton}}" stepKey="resetSearchFilter"/>
+        <fillField userInput="{{storeGroup.name}}" selector="{{AdminStoresGridSection.storeGrpFilterTextField}}" stepKey="fillSearchStoreGroupField"/>
+        <click selector="{{AdminStoresGridSection.searchButton}}" stepKey="clickSearchButton"/>
+        <see userInput="{{storeGroup.name}}" selector="{{AdminStoresGridSection.storeGrpNameInFirstRow}}" stepKey="verifyThatCorrectStoreGroupFound"/>
+        <click selector="{{AdminStoresGridSection.storeGrpNameInFirstRow}}" stepKey="clickEditExistingStoreRow"/>
+        <waitForPageLoad stepKey="waitForStoreGroupPageLoad" />
+        <selectOption selector="{{AdminNewStoreGroupSection.storeGrpWebsiteDropdown}}" userInput="{{website.name}}" stepKey="selectWebsite" />
+        <click selector="{{AdminNewStoreGroupActionsSection.saveButton}}" stepKey="clickSaveStoreGroup" />
+        <waitForElementVisible selector="{{AdminStoresGridSection.storeFilterTextField}}" stepKey="waitForPageReload"/>
+        <see userInput="You saved the store." stepKey="seeSavedMessage" />
+    </actionGroup>
 </actionGroups>

From 042d75fbf22b9abb06a843a9139238ad6d303950 Mon Sep 17 00:00:00 2001
From: Sona Sargsyan <sona_sargsyan@epam.com>
Date: Fri, 30 Nov 2018 12:43:13 +0400
Subject: [PATCH 16/70] MAGETWO-96107: Additional blank option in country
 dropdown

- Added some corrections based on comments
---
 ...kingCountryDropDownWithOneAllowedCountryTest.xml |  4 ++--
 .../OpenEditCustomerFromAdminActionGroup.xml        | 13 -------------
 2 files changed, 2 insertions(+), 15 deletions(-)

diff --git a/app/code/Magento/Config/Test/Mftf/Test/CheckingCountryDropDownWithOneAllowedCountryTest.xml b/app/code/Magento/Config/Test/Mftf/Test/CheckingCountryDropDownWithOneAllowedCountryTest.xml
index af620ea2d2ade..b0a7ee07ddad0 100644
--- a/app/code/Magento/Config/Test/Mftf/Test/CheckingCountryDropDownWithOneAllowedCountryTest.xml
+++ b/app/code/Magento/Config/Test/Mftf/Test/CheckingCountryDropDownWithOneAllowedCountryTest.xml
@@ -24,8 +24,8 @@
         <after>
             <createData entity="DisableAdminAccountAllowCountry" stepKey="setDefaultValueForAllowCountries"/>
             <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
-            <actionGroup ref="DeleteCustomerAdminActionGroup" stepKey="deleteCustomer">
-                <argument name="customer" value="CustomerEntityOne"/>
+            <actionGroup ref="AdminDeleteCustomerActionGroup" stepKey="deleteCustomer">
+                <argument name="customerEmail" value="CustomerEntityOne.email"/>
             </actionGroup>
             <actionGroup ref="AdminClearCustomersFiltersActionGroup" stepKey="clearFilters"/>
             <waitForPageLoad stepKey="WaitForPageToLoad"/>
diff --git a/app/code/Magento/Customer/Test/Mftf/ActionGroup/OpenEditCustomerFromAdminActionGroup.xml b/app/code/Magento/Customer/Test/Mftf/ActionGroup/OpenEditCustomerFromAdminActionGroup.xml
index b727c6f77d203..5b3a7a70aa2e6 100755
--- a/app/code/Magento/Customer/Test/Mftf/ActionGroup/OpenEditCustomerFromAdminActionGroup.xml
+++ b/app/code/Magento/Customer/Test/Mftf/ActionGroup/OpenEditCustomerFromAdminActionGroup.xml
@@ -35,21 +35,8 @@
         <click selector="{{AdminCustomerGridMainActionsSection.delete}}" stepKey="clickDelete"/>
         <waitForAjaxLoad stepKey="waitForLoadConfirmation"/>
         <click selector="{{AdminConfirmationModalSection.ok}}" stepKey="confirmDelete"/>
-        <wait time="5" stepKey="aaa"/>
         <see selector="{{AdminMessagesSection.successMessage}}" userInput="A total of 1 record(s) were deleted" stepKey="seeSuccess"/>
     </actionGroup>
-
-    <actionGroup name="DeleteCustomerAdminActionGroup" extends="DeleteCustomerFromAdminActionGroup">
-        <arguments>
-            <argument name="customer"/>
-        </arguments>
-        <remove keyForRemoval="fillSearch"/>
-        <remove keyForRemoval="clickSubmit"/>
-        <click selector="{{AdminDataGridHeaderSection.filters}}" stepKey="openFiltersSectionOnCustomerPage" after="clickOnButtonToRemoveFiltersIfPresent"/>
-        <fillField userInput="{{customer.email}}" selector="{{AdminDataGridHeaderSection.filterFieldInput('email')}}" stepKey="fillEmailOnFiltersSection" after="openFiltersSectionOnCustomerPage"/>
-        <click selector="{{AdminDataGridHeaderSection.applyFilters}}" stepKey="clickApplyFiltersButton" after="fillEmailOnFiltersSection"/>
-    </actionGroup>
-
     <actionGroup name="AdminClearCustomersFiltersActionGroup">
         <amOnPage url="{{AdminCustomerPage.url}}" stepKey="amOnCustomersPage"/>
         <waitForPageLoad stepKey="WaitForPageToLoad"/>

From 84662d91f5d57ea348f6691366f92cf48ad91b9b Mon Sep 17 00:00:00 2001
From: David Grigoryan <david_grigoryan@epam.com>
Date: Fri, 30 Nov 2018 13:09:18 +0400
Subject: [PATCH 17/70] MAGETWO-96413: Restricted Admin User Backend Order
 Creation Issue

- Add automated test script
---
 ...omerWithWebsiteAndStoreViewActionGroup.xml | 21 +++++++++++++++++++
 .../ActionGroup/AdminOrderActionGroup.xml     | 11 +++++++++-
 .../AdminCreateStoreGroupActionGroup.xml      | 18 ++++++++++++++++
 3 files changed, 49 insertions(+), 1 deletion(-)

diff --git a/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminCreateCustomerWithWebsiteAndStoreViewActionGroup.xml b/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminCreateCustomerWithWebsiteAndStoreViewActionGroup.xml
index 0071acf2ef1e0..2c6410f7d45cd 100644
--- a/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminCreateCustomerWithWebsiteAndStoreViewActionGroup.xml
+++ b/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminCreateCustomerWithWebsiteAndStoreViewActionGroup.xml
@@ -40,4 +40,25 @@
         <waitForPageLoad stepKey="waitForCustomersPage"/>
         <see stepKey="seeSuccessMessage" userInput="You saved the customer."/>
     </actionGroup>
+
+    <actionGroup name="AdminCreateCustomerWithWebSiteAndGroup">
+        <arguments>
+            <argument name="customerData" defaultValue="Simple_US_Customer"/>
+            <argument name="website" type="string" defaultValue="customWebsite"/>
+            <argument name="storeView" type="string" defaultValue="customStore"/>
+        </arguments>
+        <amOnPage url="{{AdminCustomerPage.url}}" stepKey="goToCustomersPage"/>
+        <click stepKey="addNewCustomer" selector="{{AdminCustomerGridMainActionsSection.addNewCustomer}}"/>
+        <selectOption stepKey="selectWebSite" selector="{{AdminCustomerAccountInformationSection.associateToWebsite}}" userInput="{{website}}"/>
+        <fillField stepKey="FillFirstName" selector="{{AdminCustomerAccountInformationSection.firstName}}" userInput="{{customerData.firstname}}"/>
+        <fillField stepKey="FillLastName" selector="{{AdminCustomerAccountInformationSection.lastName}}" userInput="{{customerData.lastname}}"/>
+        <fillField stepKey="FillEmail" selector="{{AdminCustomerAccountInformationSection.email}}" userInput="{{customerData.email}}"/>
+        <selectOption stepKey="selectStoreView" selector="{{AdminCustomerAccountInformationSection.storeView}}" userInput="{{storeView}}"/>
+        <click selector="{{AdminCustomerAccountInformationSection.group}}" stepKey="ClickToExpandGroup"/>
+        <waitForElement selector="{{AdminProductFormAdvancedPricingSection.productTierPriceGroupOrCatalogOption('Default (General)')}}" stepKey="waitForCustomerGroupExpand"/>
+        <click selector="{{AdminCustomerAccountInformationSection.groupValue('Default (General)')}}" after="waitForCustomerGroupExpand" stepKey="ClickToSelectGroup"/>
+        <click stepKey="save" selector="{{AdminCustomerAccountInformationSection.saveCustomer}}"/>
+        <waitForPageLoad stepKey="waitForCustomersPage"/>
+        <see stepKey="seeSuccessMessage" userInput="You saved the customer."/>
+    </actionGroup>
 </actionGroups>
diff --git a/app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminOrderActionGroup.xml b/app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminOrderActionGroup.xml
index cc8a62ca48961..0ffc8a5d460d6 100644
--- a/app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminOrderActionGroup.xml
+++ b/app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminOrderActionGroup.xml
@@ -53,6 +53,15 @@
         <see selector="{{AdminHeaderSection.pageTitle}}" userInput="Create New Order" stepKey="seeNewOrderPageTitle"/>
     </actionGroup>
 
+    <!--Navigate to New Order Page for existing Customer And Store-->
+    <actionGroup name="NavigateToNewOrderPageExistingCustomerAndStoreActionGroup" extends="navigateToNewOrderPageExistingCustomer" >
+        <arguments>
+            <argument name="storeView" defaultValue="_defaultStore"/>
+        </arguments>
+        <click selector="{{AdminOrderStoreScopeTreeSection.storeOption(storeView.name)}}" stepKey="selectStoreView" after="waitForCreateOrderPageLoad"/>
+        <waitForPageLoad stepKey="waitForLoad" after="selectStoreView"/>
+    </actionGroup>
+
     <!--Check the required fields are actually required-->
     <actionGroup name="checkRequiredFieldsNewOrderForm">
         <seeElement selector="{{AdminOrderFormAccountSection.requiredGroup}}" stepKey="seeCustomerGroupRequired"/>
@@ -320,4 +329,4 @@
         <see selector="{{AdminMessagesSection.success}}" userInput="You canceled the order." stepKey="seeCancelSuccessMessage"/>
         <see selector="{{AdminOrderDetailsInformationSection.orderStatus}}" userInput="Canceled" stepKey="seeOrderStatusCanceled"/>
     </actionGroup>
-</actionGroups>
\ No newline at end of file
+</actionGroups>
diff --git a/app/code/Magento/Store/Test/Mftf/ActionGroup/AdminCreateStoreGroupActionGroup.xml b/app/code/Magento/Store/Test/Mftf/ActionGroup/AdminCreateStoreGroupActionGroup.xml
index b21c79692a7cf..50ed5a28a4e81 100644
--- a/app/code/Magento/Store/Test/Mftf/ActionGroup/AdminCreateStoreGroupActionGroup.xml
+++ b/app/code/Magento/Store/Test/Mftf/ActionGroup/AdminCreateStoreGroupActionGroup.xml
@@ -23,4 +23,22 @@
         <waitForElementVisible selector="{{AdminStoresGridSection.storeFilterTextField}}" stepKey="waitForPageReload"/>
         <see userInput="You saved the store." stepKey="seeSavedMessage" />
     </actionGroup>
+
+    <actionGroup name="AdminAddCustomWebSiteToStoreGroup">
+        <arguments>
+            <argument name="storeGroup" defaultValue="customStoreGroup"/>
+            <argument name="website" defaultValue="customWebsite"/>
+        </arguments>
+        <amOnPage url="{{AdminSystemStorePage.url}}" stepKey="amOnAdminSystemStorePage"/>
+        <click selector="{{AdminStoresGridSection.resetButton}}" stepKey="resetSearchFilter"/>
+        <fillField userInput="{{storeGroup.name}}" selector="{{AdminStoresGridSection.storeGrpFilterTextField}}" stepKey="fillSearchStoreGroupField"/>
+        <click selector="{{AdminStoresGridSection.searchButton}}" stepKey="clickSearchButton"/>
+        <see userInput="{{storeGroup.name}}" selector="{{AdminStoresGridSection.storeGrpNameInFirstRow}}" stepKey="verifyThatCorrectStoreGroupFound"/>
+        <click selector="{{AdminStoresGridSection.storeGrpNameInFirstRow}}" stepKey="clickEditExistingStoreRow"/>
+        <waitForPageLoad stepKey="waitForStoreGroupPageLoad" />
+        <selectOption selector="{{AdminNewStoreGroupSection.storeGrpWebsiteDropdown}}" userInput="{{website.name}}" stepKey="selectWebsite" />
+        <click selector="{{AdminNewStoreGroupActionsSection.saveButton}}" stepKey="clickSaveStoreGroup" />
+        <waitForElementVisible selector="{{AdminStoresGridSection.storeFilterTextField}}" stepKey="waitForPageReload"/>
+        <see userInput="You saved the store." stepKey="seeSavedMessage" />
+    </actionGroup>
 </actionGroups>

From 4b6f980094e8745991cf362a90954a72873836eb Mon Sep 17 00:00:00 2001
From: Lusine Papyan <lusine_papyan@epam.com>
Date: Wed, 5 Dec 2018 11:35:47 +0400
Subject: [PATCH 18/70] MAGETWO-96409: [2.3.x] [MAGENTO CLOUD] Unable to add
 more attributes in size

- Add automated test script
---
 ...minAttributeTextSwatchesCanBeFiledTest.xml | 116 ++++++++++++++++++
 .../AdminCreateProductAttributeSection.xml    |   5 +
 .../Store/Test/Mftf/Data/StoreData.xml        |  74 +++++++++++
 3 files changed, 195 insertions(+)
 create mode 100644 app/code/Magento/Backend/Test/Mftf/Test/AdminAttributeTextSwatchesCanBeFiledTest.xml

diff --git a/app/code/Magento/Backend/Test/Mftf/Test/AdminAttributeTextSwatchesCanBeFiledTest.xml b/app/code/Magento/Backend/Test/Mftf/Test/AdminAttributeTextSwatchesCanBeFiledTest.xml
new file mode 100644
index 0000000000000..2c061e54f5509
--- /dev/null
+++ b/app/code/Magento/Backend/Test/Mftf/Test/AdminAttributeTextSwatchesCanBeFiledTest.xml
@@ -0,0 +1,116 @@
+<?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="AdminAttributeTextSwatchesCanBeFiledTest">
+        <annotations>
+            <features value="Backend"/>
+            <stories value="Unable to add more attributes in size"/>
+            <title value="Check that attribute text swatches can be filed"/>
+            <description value="Check that attribute text swatches can be filed"/>
+            <severity value="MAJOR"/>
+            <testCaseId value="MAGETWO-96710"/>
+            <useCaseId value="MAGETWO-96409"/>
+            <group value="backend"/>
+            <group value="ui"/>
+        </annotations>
+        <before>
+
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+
+        </before>
+        <after>
+            <!-- Delete all 10 store views -->
+            <actionGroup ref="AdminDeleteStoreViewActionGroup" stepKey="deleteStoreView1">
+                <argument name="customStore" value="customStore"/>
+            </actionGroup>
+            <actionGroup ref="AdminDeleteStoreViewActionGroup" stepKey="deleteStoreView2">
+                <argument name="customStore" value="NewStoreViewData"/>
+            </actionGroup>
+            <actionGroup ref="AdminDeleteStoreViewActionGroup" stepKey="deleteStoreView3">
+                <argument name="customStore" value="storeViewData"/>
+            </actionGroup>
+            <actionGroup ref="AdminDeleteStoreViewActionGroup" stepKey="deleteStoreView4">
+                <argument name="customStore" value="storeViewData1"/>
+            </actionGroup>
+            <actionGroup ref="AdminDeleteStoreViewActionGroup" stepKey="deleteStoreView5">
+                <argument name="customStore" value="storeViewData2"/>
+            </actionGroup>
+            <actionGroup ref="AdminDeleteStoreViewActionGroup" stepKey="deleteStoreView6">
+                <argument name="customStore" value="storeViewData3"/>
+            </actionGroup>
+            <actionGroup ref="AdminDeleteStoreViewActionGroup" stepKey="deleteStoreView7">
+                <argument name="customStore" value="storeViewData4"/>
+            </actionGroup>
+            <actionGroup ref="AdminDeleteStoreViewActionGroup" stepKey="deleteStoreView8">
+                <argument name="customStore" value="storeViewData5"/>
+            </actionGroup>
+            <actionGroup ref="AdminDeleteStoreViewActionGroup" stepKey="deleteStoreView9">
+                <argument name="customStore" value="storeViewData6"/>
+            </actionGroup>
+            <actionGroup ref="AdminDeleteStoreViewActionGroup" stepKey="deleteStoreView10">
+                <argument name="customStore" value="storeViewData7"/>
+            </actionGroup>
+
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+
+        <!-- Create 10 store views -->
+        <actionGroup ref="AdminCreateStoreViewActionGroup" stepKey="createStoreView1">
+            <argument name="customStore" value="customStore"/>
+        </actionGroup>
+        <actionGroup ref="AdminCreateStoreViewActionGroup" stepKey="createStoreView2">
+            <argument name="customStore" value="NewStoreViewData"/>
+        </actionGroup>
+        <actionGroup ref="AdminCreateStoreViewActionGroup" stepKey="createStoreView3">
+            <argument name="customStore" value="storeViewData"/>
+        </actionGroup>
+        <actionGroup ref="AdminCreateStoreViewActionGroup" stepKey="createStoreView4">
+            <argument name="customStore" value="storeViewData1"/>
+        </actionGroup>
+        <actionGroup ref="AdminCreateStoreViewActionGroup" stepKey="createStoreView5">
+            <argument name="customStore" value="storeViewData2"/>
+        </actionGroup>
+        <actionGroup ref="AdminCreateStoreViewActionGroup" stepKey="createStoreView6">
+            <argument name="customStore" value="storeViewData3"/>
+        </actionGroup>
+        <actionGroup ref="AdminCreateStoreViewActionGroup" stepKey="createStoreView7">
+            <argument name="customStore" value="storeViewData4"/>
+        </actionGroup>
+        <actionGroup ref="AdminCreateStoreViewActionGroup" stepKey="createStoreView8">
+            <argument name="customStore" value="storeViewData5"/>
+        </actionGroup>
+        <actionGroup ref="AdminCreateStoreViewActionGroup" stepKey="createStoreView9">
+            <argument name="customStore" value="storeViewData6"/>
+        </actionGroup>
+        <actionGroup ref="AdminCreateStoreViewActionGroup" stepKey="createStoreView10">
+            <argument name="customStore" value="storeViewData7"/>
+        </actionGroup>
+
+        <!--Navigate to Product attribute page-->
+        <amOnPage url="{{ProductAttributePage.url}}" stepKey="navigateToNewProductAttributePage"/>
+        <waitForPageLoad stepKey="waitForPageLoad"/>
+        <fillField userInput="test_label" selector="{{AttributePropertiesSection.DefaultLabel}}" stepKey="fillDefaultLabel"/>
+        <selectOption selector="{{AttributePropertiesSection.InputType}}" userInput="Text Swatch" stepKey="selectInputType"/>
+        <click selector="{{AttributePropertiesSection.addSwatch}}" stepKey="clickAddSwatch"/>
+        <waitForAjaxLoad stepKey="waitForAjaxLoad"/>
+
+        <!-- Fill Swatch and Description fields for Admin -->
+        <fillField selector="{{AttributeManageSwatchSection.swatchField('Admin')}}" userInput="test" stepKey="fillSwatchForAdmin"/>
+        <fillField selector="{{AttributeManageSwatchSection.descriptionField('Admin')}}" userInput="test" stepKey="fillDescriptionForAdmin"/>
+
+        <!-- Grab value Swatch and Description fields for Admin -->
+        <grabValueFrom selector="{{AttributeManageSwatchSection.swatchField('Admin')}}" stepKey="grabSwatchForAdmin"/>
+        <grabValueFrom selector="{{AttributeManageSwatchSection.descriptionField('Admin')}}" stepKey="grabDescriptionForAdmin"/>
+
+        <!-- Check that Swatch and Description fields for Admin are not empty-->
+        <assertNotEmpty actual="$grabSwatchForAdmin" stepKey="checkSwatchFieldForAdmin"/>
+        <assertNotEmpty actual="$grabDescriptionForAdmin" stepKey="checkDescriptionFieldForAdmin"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/AdminCreateProductAttributeSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/AdminCreateProductAttributeSection.xml
index 324f261f3a50a..05be20b14acc0 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Section/AdminCreateProductAttributeSection.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/AdminCreateProductAttributeSection.xml
@@ -22,6 +22,11 @@
         <element name="TinyMCE4" type="button" selector="//span[text()='Default Value']/parent::label/following-sibling::div//div[@class='mce-branding-powered-by']"/>
         <element name="checkIfTabOpen" selector="//div[@id='advanced_fieldset-wrapper' and not(contains(@class,'opened'))]" type="button"/>
         <element name="useInLayeredNavigation" type="select" selector="#is_filterable"/>
+        <element name="addSwatch" type="button" selector="#add_new_swatch_text_option_button"/>
+    </section>
+    <section name="AttributeManageSwatchSection">
+        <element name="swatchField" type="input" selector="//th[contains(@class, 'col-swatch')]/span[contains(text(), '{{arg}}')]/ancestor::thead/following-sibling::tbody//input[@placeholder='Swatch']" parameterized="true"/>
+        <element name="descriptionField" type="input" selector="//th[contains(@class, 'col-swatch')]/span[contains(text(), '{{arg}}')]/ancestor::thead/following-sibling::tbody//input[@placeholder='Description']" parameterized="true"/>
     </section>
     <section name="AttributeOptionsSection">
         <element name="AddOption" type="button" selector="#add_new_option_button"/>
diff --git a/app/code/Magento/Store/Test/Mftf/Data/StoreData.xml b/app/code/Magento/Store/Test/Mftf/Data/StoreData.xml
index 9fae618020ff3..c315f0d5ccdda 100644
--- a/app/code/Magento/Store/Test/Mftf/Data/StoreData.xml
+++ b/app/code/Magento/Store/Test/Mftf/Data/StoreData.xml
@@ -65,4 +65,78 @@
         <data key="name" unique="suffix">StoreView</data>
         <data key="code" unique="suffix">StoreViewCode</data>
     </entity>
+
+    <!-- For creation 10 Store Views-->
+    <entity name="storeViewData" type="store">
+        <data key="group_id">1</data>
+        <data key="name" unique="suffix">storeView</data>
+        <data key="code" unique="suffix">storeView</data>
+        <data key="is_active">1</data>
+        <data key="store_id">null</data>
+        <data key="store_type">store</data>
+        <data key="store_action">add</data>
+    </entity>
+    <entity name="storeViewData1" type="store">
+        <data key="group_id">1</data>
+        <data key="name" unique="suffix">storeView</data>
+        <data key="code" unique="suffix">storeView</data>
+        <data key="is_active">1</data>
+        <data key="store_id">null</data>
+        <data key="store_type">store</data>
+        <data key="store_action">add</data>
+    </entity>
+    <entity name="storeViewData2" type="store">
+        <data key="group_id">1</data>
+        <data key="name" unique="suffix">storeView</data>
+        <data key="code" unique="suffix">storeView</data>
+        <data key="is_active">1</data>
+        <data key="store_id">null</data>
+        <data key="store_type">store</data>
+        <data key="store_action">add</data>
+    </entity>
+    <entity name="storeViewData3" type="store">
+        <data key="group_id">1</data>
+        <data key="name" unique="suffix">storeView</data>
+        <data key="code" unique="suffix">storeView</data>
+        <data key="is_active">1</data>
+        <data key="store_id">null</data>
+        <data key="store_type">store</data>
+        <data key="store_action">add</data>
+    </entity>
+    <entity name="storeViewData4" type="store">
+        <data key="group_id">1</data>
+        <data key="name" unique="suffix">storeView</data>
+        <data key="code" unique="suffix">storeView</data>
+        <data key="is_active">1</data>
+        <data key="store_id">null</data>
+        <data key="store_type">store</data>
+        <data key="store_action">add</data>
+    </entity>
+    <entity name="storeViewData5" type="store">
+        <data key="group_id">1</data>
+        <data key="name" unique="suffix">storeView</data>
+        <data key="code" unique="suffix">storeView</data>
+        <data key="is_active">1</data>
+        <data key="store_id">null</data>
+        <data key="store_type">store</data>
+        <data key="store_action">add</data>
+    </entity>
+    <entity name="storeViewData6" type="store">
+        <data key="group_id">1</data>
+        <data key="name" unique="suffix">storeView</data>
+        <data key="code" unique="suffix">storeView</data>
+        <data key="is_active">1</data>
+        <data key="store_id">null</data>
+        <data key="store_type">store</data>
+        <data key="store_action">add</data>
+    </entity>
+    <entity name="storeViewData7" type="store">
+        <data key="group_id">1</data>
+        <data key="name" unique="suffix">storeView</data>
+        <data key="code" unique="suffix">storeView</data>
+        <data key="is_active">1</data>
+        <data key="store_id">null</data>
+        <data key="store_type">store</data>
+        <data key="store_action">add</data>
+    </entity>
 </entities>

From 7c5373cc595c8e3b877084542af3127f18f486c2 Mon Sep 17 00:00:00 2001
From: Alexey Yakimovich <yakimovich@almagy.com>
Date: Fri, 7 Dec 2018 17:40:08 +0300
Subject: [PATCH 19/70] MAGETWO-95837: Product is added to Wish List with
 Attributes selected however they were unselected on PDP before

- Fixed static and functional tests;
---
 ...fProdAddToCartWishListWithUnselectedAttrTest.xml |  9 ++-------
 .../view/frontend/web/js/add-to-wishlist.js         | 13 ++++++-------
 2 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/app/code/Magento/Wishlist/Test/Mftf/Test/ConfProdAddToCartWishListWithUnselectedAttrTest.xml b/app/code/Magento/Wishlist/Test/Mftf/Test/ConfProdAddToCartWishListWithUnselectedAttrTest.xml
index 6669e90c8d3e3..800b0a060edac 100644
--- a/app/code/Magento/Wishlist/Test/Mftf/Test/ConfProdAddToCartWishListWithUnselectedAttrTest.xml
+++ b/app/code/Magento/Wishlist/Test/Mftf/Test/ConfProdAddToCartWishListWithUnselectedAttrTest.xml
@@ -55,15 +55,10 @@
         <selectOption userInput="{{colorProductAttribute2.name}}" selector="{{StorefrontProductInfoMainSection.productAttributeOptionsSelectButton}}" stepKey="selectOption2"/>
         <click selector="{{StorefrontProductInfoMainSection.productAttributeOptions1}}" stepKey="clickDropDownProductOption"/>
 
-        <!--Add the product to Wish List-->
+        <!--Click Add to Wish List link-->
         <click selector="{{StorefrontProductPageSection.addToWishlist}}" stepKey="addFirstPnroductToWishlist"/>
-        <waitForPageLoad stepKey="waitForLoading"/>
-        <!--Click "Add All to Cart" button-->
-        <click selector="{{StorefrontCustomerWishlistProductSection.ProductAddAllToCart}}" stepKey="addAllToCart"/>
-        <waitForElementVisible stepKey="waitForErrorAppears" selector="{{StorefrontMessagesSection.error}}"/>
 
         <!--Assert Correct Error Message-->
-        <see userInput="You need to choose options for your item for" stepKey="assertCorrectErrorMessage"/>
-        <dontSee userInput="1 product(s) have been added to shopping cart" stepKey="dontSeeSuccessMessage"/>
+        <see userInput="This is a required field" selector="{{StorefrontProductInfoMainSection.productAttributeOptionsError}}" stepKey="seeError"/>
     </test>
 </tests>
diff --git a/app/code/Magento/Wishlist/view/frontend/web/js/add-to-wishlist.js b/app/code/Magento/Wishlist/view/frontend/web/js/add-to-wishlist.js
index 3cc20e23f68a2..2fc55b6135079 100644
--- a/app/code/Magento/Wishlist/view/frontend/web/js/add-to-wishlist.js
+++ b/app/code/Magento/Wishlist/view/frontend/web/js/add-to-wishlist.js
@@ -154,16 +154,15 @@ define([
                 $.each(elementValue, function (key, option) {
                     data[elementName + '[' + option + ']'] = option;
                 });
-            } else {
-                if (elementName.substr(elementName.length - 2) == '[]') { //eslint-disable-line eqeqeq, max-depth
-                    elementName = elementName.substring(0, elementName.length - 2);
+            } else if (elementName.substr(elementName.length - 2) == '[]') { //eslint-disable-line eqeqeq, max-depth
+                elementName = elementName.substring(0, elementName.length - 2);
 
-                    data[elementName + '[' + elementValue + ']'] = elementValue;
-                } else {
-                    data[elementName] = elementValue;
-                }
+                data[elementName + '[' + elementValue + ']'] = elementValue;
+            } else {
+                data[elementName] = elementValue;
             }
 
+
             return data;
         },
 

From c3ea7f154c471d9745a75987a5136bfdfab83fce Mon Sep 17 00:00:00 2001
From: Alexey Yakimovich <yakimovich@almagy.com>
Date: Mon, 10 Dec 2018 16:40:27 +0300
Subject: [PATCH 20/70] MAGETWO-95837: Product is added to Wish List with
 Attributes selected however they were unselected on PDP before

- Fixed static test.
---
 .../Magento/Wishlist/view/frontend/web/js/add-to-wishlist.js     | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/code/Magento/Wishlist/view/frontend/web/js/add-to-wishlist.js b/app/code/Magento/Wishlist/view/frontend/web/js/add-to-wishlist.js
index 2fc55b6135079..7a166b47256cb 100644
--- a/app/code/Magento/Wishlist/view/frontend/web/js/add-to-wishlist.js
+++ b/app/code/Magento/Wishlist/view/frontend/web/js/add-to-wishlist.js
@@ -162,7 +162,6 @@ define([
                 data[elementName] = elementValue;
             }
 
-
             return data;
         },
 

From efc902438576d392b628770613db80cf2a4e7114 Mon Sep 17 00:00:00 2001
From: Dzmitry Tabusheu <dzmitry_tabusheu@epam.com>
Date: Tue, 11 Dec 2018 16:38:44 +0300
Subject: [PATCH 21/70] MAGETWO-91640: Scheduled Import of Products fails on
 error when errors should be skipped

- Fixed static test
---
 app/code/Magento/ImportExport/Model/Import.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/ImportExport/Model/Import.php b/app/code/Magento/ImportExport/Model/Import.php
index e29ad13058e6d..1cc8dc224acb6 100644
--- a/app/code/Magento/ImportExport/Model/Import.php
+++ b/app/code/Magento/ImportExport/Model/Import.php
@@ -636,7 +636,7 @@ public function validateSource(\Magento\ImportExport\Model\Import\AbstractSource
         if ($errorsCount
             && $validationStrategy === ProcessingErrorAggregatorInterface::VALIDATION_STRATEGY_SKIP_ERRORS
         ) {
-            $this->messageManager->addWarningMessage(sprintf(__('Skipped errors: %d'), $errorsCount));
+            $this->messageManager->addWarningMessage(__('Skipped errors: %1', $errorsCount));
             $result = true;
         }
 

From 1dc27c1bd245402a894035e52ff53f02dc329451 Mon Sep 17 00:00:00 2001
From: Devagouda Patil <depatil@Devagoudas-MacBook-Pro.local>
Date: Wed, 19 Dec 2018 13:00:14 +0530
Subject: [PATCH 22/70] MC-5593: [Modularity] Braintree module MFTF contain
 wide used sections and action groups - Moved/updated files and deleted some
 to remove deplication

---
 .../Test/Mftf/Section/AdminMenuSection.xml    |  6 ++++
 .../AdminOrderBraintreeFillActionGroup.xml    |  2 +-
 .../ConfigureBraintreeActionGroup.xml         |  2 +-
 .../Mftf/Section/AdminEditRoleInfoSection.xml | 21 --------------
 .../Mftf/Section/AdminEditUserRoleSection.xml | 17 -----------
 .../Mftf/Section/AdminEditUserSection.xml     | 28 -------------------
 .../Test/Mftf/Section/AdminMenuSection.xml    | 23 ---------------
 .../Mftf/Section/AdminRoleGridSection.xml     | 17 -----------
 .../Section/BraintreeConfiguraionSection.xml  |  3 +-
 .../Section/ConfigurationPaymentSection.xml   |  4 +--
 .../Mftf/Section/StoresSubmenuSection.xml     | 14 ----------
 .../CreateNewProductActionGroup.xml           |  4 +--
 .../ActionGroup/DeleteProductActionGroup.xml  |  2 +-
 .../Test/Mftf/Data/NewProductData.xml         |  2 +-
 .../Mftf/Section/CatalogSubmenuSection.xml    |  2 +-
 .../Mftf/Section/NewProductPageSection.xml    |  2 +-
 .../Test/Mftf/Section/ProductsPageSection.xml |  2 +-
 .../ActionGroup/CreateCustomerActionGroup.xml |  2 +-
 .../ActionGroup/DeleteCustomerActionGroup.xml |  0
 .../ActionGroup/SwitchAccountActionGroup.xml  |  3 +-
 .../Test/Mftf/Data/NewCustomerData.xml        |  2 +-
 .../Mftf/Section/AdminCreateUserSection.xml   |  3 +-
 .../Mftf/Section/AdminDeleteUserSection.xml   |  3 +-
 .../Mftf/Section/AdminUserGridSection.xml     |  3 +-
 .../Mftf/Section/CustomersPageSection.xml     |  2 +-
 .../Mftf/Section/CustomersSubmenuSection.xml  |  2 +-
 .../Mftf/Section/NewCustomerPageSection.xml   |  2 +-
 .../Mftf/Section/SwitchAccountSection.xml     |  3 +-
 .../ActionGroup/CreateNewOrderActionGroup.xml |  3 +-
 .../Mftf/Section/ConfigurationListSection.xml |  2 +-
 .../Test/Mftf/Section/NewOrderSection.xml     |  3 +-
 .../Mftf/ActionGroup/AdminTaxActionGroup.xml  |  8 +++---
 .../Mftf/Section/AdminCreateRoleSection.xml   |  3 +-
 .../Mftf/Section/AdminDeleteRoleSection.xml   |  5 ++--
 .../Mftf/Section/AdminEditUserSection.xml     |  6 +++-
 35 files changed, 50 insertions(+), 156 deletions(-)
 delete mode 100644 app/code/Magento/Braintree/Test/Mftf/Section/AdminEditRoleInfoSection.xml
 delete mode 100644 app/code/Magento/Braintree/Test/Mftf/Section/AdminEditUserRoleSection.xml
 delete mode 100644 app/code/Magento/Braintree/Test/Mftf/Section/AdminEditUserSection.xml
 delete mode 100644 app/code/Magento/Braintree/Test/Mftf/Section/AdminMenuSection.xml
 delete mode 100644 app/code/Magento/Braintree/Test/Mftf/Section/AdminRoleGridSection.xml
 delete mode 100644 app/code/Magento/Braintree/Test/Mftf/Section/StoresSubmenuSection.xml
 rename app/code/Magento/{Braintree => Catalog}/Test/Mftf/ActionGroup/CreateNewProductActionGroup.xml (84%)
 rename app/code/Magento/{Braintree => Catalog}/Test/Mftf/ActionGroup/DeleteProductActionGroup.xml (86%)
 rename app/code/Magento/{Braintree => Catalog}/Test/Mftf/Data/NewProductData.xml (66%)
 rename app/code/Magento/{Braintree => Catalog}/Test/Mftf/Section/CatalogSubmenuSection.xml (68%)
 rename app/code/Magento/{Braintree => Catalog}/Test/Mftf/Section/NewProductPageSection.xml (81%)
 rename app/code/Magento/{Braintree => Catalog}/Test/Mftf/Section/ProductsPageSection.xml (84%)
 rename app/code/Magento/{Braintree => Customer}/Test/Mftf/ActionGroup/CreateCustomerActionGroup.xml (94%)
 rename app/code/Magento/{Braintree => Customer}/Test/Mftf/ActionGroup/DeleteCustomerActionGroup.xml (100%)
 rename app/code/Magento/{Braintree => Customer}/Test/Mftf/ActionGroup/SwitchAccountActionGroup.xml (85%)
 rename app/code/Magento/{Braintree => Customer}/Test/Mftf/Data/NewCustomerData.xml (77%)
 rename app/code/Magento/{Braintree => Customer}/Test/Mftf/Section/AdminCreateUserSection.xml (82%)
 rename app/code/Magento/{Braintree => Customer}/Test/Mftf/Section/AdminDeleteUserSection.xml (69%)
 rename app/code/Magento/{Braintree => Customer}/Test/Mftf/Section/AdminUserGridSection.xml (75%)
 rename app/code/Magento/{Braintree => Customer}/Test/Mftf/Section/CustomersPageSection.xml (84%)
 rename app/code/Magento/{Braintree => Customer}/Test/Mftf/Section/CustomersSubmenuSection.xml (68%)
 rename app/code/Magento/{Braintree => Customer}/Test/Mftf/Section/NewCustomerPageSection.xml (92%)
 rename app/code/Magento/{Braintree => Customer}/Test/Mftf/Section/SwitchAccountSection.xml (78%)
 rename app/code/Magento/{Braintree => Sales}/Test/Mftf/ActionGroup/CreateNewOrderActionGroup.xml (90%)
 rename app/code/Magento/{Braintree => Sales}/Test/Mftf/Section/ConfigurationListSection.xml (72%)
 rename app/code/Magento/{Braintree => Sales}/Test/Mftf/Section/NewOrderSection.xml (90%)
 rename app/code/Magento/{Braintree => User}/Test/Mftf/Section/AdminCreateRoleSection.xml (84%)
 rename app/code/Magento/{Braintree => User}/Test/Mftf/Section/AdminDeleteRoleSection.xml (64%)

diff --git a/app/code/Magento/Backend/Test/Mftf/Section/AdminMenuSection.xml b/app/code/Magento/Backend/Test/Mftf/Section/AdminMenuSection.xml
index 9e4a6d9219526..30c3c4bbca3b3 100644
--- a/app/code/Magento/Backend/Test/Mftf/Section/AdminMenuSection.xml
+++ b/app/code/Magento/Backend/Test/Mftf/Section/AdminMenuSection.xml
@@ -16,5 +16,11 @@
         <element name="widgets" type="button" selector="#nav li[data-ui-id='menu-magento-widget-cms-widget-instance']"/>
         <element name="stores" type="button" selector="#menu-magento-backend-stores"/>
         <element name="configuration" type="button" selector="#nav li[data-ui-id='menu-magento-config-system-config']"/>
+        <element name="dashboard" type="button" selector="//li[@id='menu-magento-backend-dashboard']"/>
+        <element name="sales" type="button" selector="//li[@id='menu-magento-sales-sales']"/>
+        <element name="marketing" type="button" selector="//li[@id='menu-magento-backend-marketing']"/>
+        <element name="reports" type="button" selector="//li[@id='menu-magento-reports-report']"/>
+        <element name="system" type="button" selector="//li[@id='menu-magento-backend-system']"/>
+        <element name="findPartners" type="button" selector="//li[@id='menu-magento-marketplace-partners']"/>
     </section>
 </sections>
diff --git a/app/code/Magento/Braintree/Test/Mftf/ActionGroup/AdminOrderBraintreeFillActionGroup.xml b/app/code/Magento/Braintree/Test/Mftf/ActionGroup/AdminOrderBraintreeFillActionGroup.xml
index c2e6af9dcd735..eb909e967fb75 100644
--- a/app/code/Magento/Braintree/Test/Mftf/ActionGroup/AdminOrderBraintreeFillActionGroup.xml
+++ b/app/code/Magento/Braintree/Test/Mftf/ActionGroup/AdminOrderBraintreeFillActionGroup.xml
@@ -6,7 +6,7 @@
   */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-              xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
 
     <actionGroup name="AdminOrderBraintreeFillActionGroup">
         <!--Select Braintree Payment method on Admin Order Create Page-->
diff --git a/app/code/Magento/Braintree/Test/Mftf/ActionGroup/ConfigureBraintreeActionGroup.xml b/app/code/Magento/Braintree/Test/Mftf/ActionGroup/ConfigureBraintreeActionGroup.xml
index 9eaae8b33e73f..cbb065704fbc1 100644
--- a/app/code/Magento/Braintree/Test/Mftf/ActionGroup/ConfigureBraintreeActionGroup.xml
+++ b/app/code/Magento/Braintree/Test/Mftf/ActionGroup/ConfigureBraintreeActionGroup.xml
@@ -12,7 +12,7 @@
         <!-- GoTo ConfigureBraintree fields -->
         <click stepKey="clickOnSTORES" selector="{{AdminMenuSection.stores}}"/>
         <waitForPageLoad stepKey="waitForConfiguration" time="2"/>
-        <click stepKey="clickOnConfigurations" selector="{{StoresSubmenuSection.configuration}}" />
+        <click stepKey="clickOnConfigurations" selector="{{AdminMenuSection.configuration}}" />
         <waitForPageLoad stepKey="waitForSales" time="2"/>
         <click stepKey="clickOnSales" selector="{{ConfigurationListSection.sales}}" />
         <waitForPageLoad stepKey="waitForPaymentMethods" time="2"/>
diff --git a/app/code/Magento/Braintree/Test/Mftf/Section/AdminEditRoleInfoSection.xml b/app/code/Magento/Braintree/Test/Mftf/Section/AdminEditRoleInfoSection.xml
deleted file mode 100644
index e37ce8f4738b3..0000000000000
--- a/app/code/Magento/Braintree/Test/Mftf/Section/AdminEditRoleInfoSection.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--->
-<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-    <section name="AdminEditRoleInfoSection">
-        <element name="roleName" type="input" selector="#role_name"/>
-        <element name="password" type="input" selector="#current_password"/>
-        <element name="roleResourcesTab" type="button" selector="#role_info_tabs_account"/>
-        <element name="backButton" type="button" selector="button[title='Back']"/>
-        <element name="resetButton" type="button" selector="button[title='Reset']"/>
-        <element name="deleteButton" type="button" selector="button[title='Delete Role']"/>
-        <element name="saveButton" type="button" selector="button[title='Save Role']"/>
-        <element name="message" type="text" selector=".modal-popup.confirm div.modal-content"/>
-        <element name="cancel" type="button" selector=".modal-popup.confirm button.action-dismiss"/>
-        <element name="ok" type="button" selector=".modal-popup.confirm button.action-accept" timeout="60"/>
-    </section>
-</sections>
\ No newline at end of file
diff --git a/app/code/Magento/Braintree/Test/Mftf/Section/AdminEditUserRoleSection.xml b/app/code/Magento/Braintree/Test/Mftf/Section/AdminEditUserRoleSection.xml
deleted file mode 100644
index e999413c96d74..0000000000000
--- a/app/code/Magento/Braintree/Test/Mftf/Section/AdminEditUserRoleSection.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--->
-<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-    <section name="AdminEditUserRoleSection">
-        <element name="usernameTextField" type="input" selector="#user_username"/>
-        <element name="roleNameFilterTextField" type="input" selector="#permissionsUserRolesGrid_filter_role_name"/>
-        <element name="searchButton" type="button" selector=".admin__data-grid-header button[title=Search]"/>
-        <element name="resetButton" type="button" selector="button[title='Reset Filter']"/>
-        <element name="roleNameInFirstRow" type="text" selector=".col-role_name"/>
-        <element name="searchResultFirstRow" type="text" selector=".data-grid>tbody>tr"/>
-    </section>
-</sections>
\ No newline at end of file
diff --git a/app/code/Magento/Braintree/Test/Mftf/Section/AdminEditUserSection.xml b/app/code/Magento/Braintree/Test/Mftf/Section/AdminEditUserSection.xml
deleted file mode 100644
index 2e5fcfb7b5c8d..0000000000000
--- a/app/code/Magento/Braintree/Test/Mftf/Section/AdminEditUserSection.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--->
-<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-    <section name="AdminEditUserSection">
-        <element name="system" type="input" selector="#menu-magento-backend-system"/>
-        <element name="allUsers" type="input" selector="//span[contains(text(), 'All Users')]"/>
-        <element name="create" type="input" selector="#add"/>
-        <element name="usernameTextField" type="input" selector="#user_username"/>
-        <element name="firstNameTextField" type="input" selector="#user_firstname"/>
-        <element name="lastNameTextField" type="input" selector="#user_lastname"/>
-        <element name="emailTextField" type="input" selector="#user_email"/>
-        <element name="passwordTextField" type="input" selector="#user_password"/>
-        <element name="pwConfirmationTextField" type="input" selector="#user_confirmation"/>
-        <element name="currentPasswordField" type="input" selector="#user_current_password"/>
-        <element name="userRoleTab" type="button" selector="#page_tabs_roles_section"/>
-        <element name="roleNameFilterTextField" type="input" selector="#permissionsUserRolesGrid_filter_role_name"/>
-        <element name="searchButton" type="button" selector=".admin__data-grid-header button[title=Search]"/>
-        <element name="resetButton" type="button" selector="button[title='Reset Filter']"/>
-        <element name="roleNameInFirstRow" type="text" selector=".col-role_name"/>
-        <element name="searchResultFirstRow" type="text" selector=".data-grid>tbody>tr"/>
-        <element name="saveButton" type="button" selector="#save"/>
-    </section>
-</sections>
\ No newline at end of file
diff --git a/app/code/Magento/Braintree/Test/Mftf/Section/AdminMenuSection.xml b/app/code/Magento/Braintree/Test/Mftf/Section/AdminMenuSection.xml
deleted file mode 100644
index eb7a9ce2c376e..0000000000000
--- a/app/code/Magento/Braintree/Test/Mftf/Section/AdminMenuSection.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--->
-
-<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-    <section name="AdminMenuSection">
-        <element name="dashboard" type="button" selector="//li[@id='menu-magento-backend-dashboard']"/>
-        <element name="sales" type="button" selector="//li[@id='menu-magento-sales-sales']"/>
-        <element name="catalog" type="button" selector="//li[@id='menu-magento-catalog-catalog']"/>
-        <element name="customers" type="button" selector="//li[@id='menu-magento-customer-customer']"/>
-        <element name="marketing" type="button" selector="//li[@id='menu-magento-backend-marketing']"/>
-        <element name="content" type="button" selector="//li[@id='menu-magento-backend-content']"/>
-        <element name="reports" type="button" selector="//li[@id='menu-magento-reports-report']"/>
-        <element name="stores" type="button" selector="//li[@id='menu-magento-backend-stores']"/>
-        <element name="system" type="button" selector="//li[@id='menu-magento-backend-system']"/>
-        <element name="findPartners" type="button" selector="//li[@id='menu-magento-marketplace-partners']"/>
-    </section>
-</sections>
diff --git a/app/code/Magento/Braintree/Test/Mftf/Section/AdminRoleGridSection.xml b/app/code/Magento/Braintree/Test/Mftf/Section/AdminRoleGridSection.xml
deleted file mode 100644
index 63cbadc71d3d3..0000000000000
--- a/app/code/Magento/Braintree/Test/Mftf/Section/AdminRoleGridSection.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--->
-<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-    <section name="AdminRoleGridSection">
-        <element name="idFilterTextField" type="input" selector="#roleGrid_filter_role_id"/>
-        <element name="roleNameFilterTextField" type="input" selector="#roleGrid_filter_role_name"/>
-        <element name="searchButton" type="button" selector=".admin__data-grid-header button[title=Search]"/>
-        <element name="resetButton" type="button" selector="button[title='Reset Filter']"/>
-        <element name="roleNameInFirstRow" type="text" selector=".col-role_name"/>
-        <element name="searchResultFirstRow" type="text" selector=".data-grid>tbody>tr"/>
-    </section>
-</sections>
\ No newline at end of file
diff --git a/app/code/Magento/Braintree/Test/Mftf/Section/BraintreeConfiguraionSection.xml b/app/code/Magento/Braintree/Test/Mftf/Section/BraintreeConfiguraionSection.xml
index 016af2e102744..98dc849644fe9 100644
--- a/app/code/Magento/Braintree/Test/Mftf/Section/BraintreeConfiguraionSection.xml
+++ b/app/code/Magento/Braintree/Test/Mftf/Section/BraintreeConfiguraionSection.xml
@@ -5,7 +5,8 @@
   * See COPYING.txt for license details.
   */
 -->
-<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
     <section name="BraintreeConfiguraionSection">
         <element name="titleForBraintreeSettings" type="input" selector="//input[@id='payment_us_braintree_section_braintree_braintree_required_title']"/>
         <element name="environment" type="select" selector="//select[@id='payment_us_braintree_section_braintree_braintree_required_environment']"/>
diff --git a/app/code/Magento/Braintree/Test/Mftf/Section/ConfigurationPaymentSection.xml b/app/code/Magento/Braintree/Test/Mftf/Section/ConfigurationPaymentSection.xml
index 885a45be721f1..8632dc62cd19d 100644
--- a/app/code/Magento/Braintree/Test/Mftf/Section/ConfigurationPaymentSection.xml
+++ b/app/code/Magento/Braintree/Test/Mftf/Section/ConfigurationPaymentSection.xml
@@ -7,8 +7,8 @@
 -->
 
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-    <section name="ConfigurationPaymentSection">
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+         <section name="ConfigurationPaymentSection">
         <element name="configureButton" type="button" selector="//button[@id='payment_us_braintree_section_braintree-head']"/>
     </section>
 </sections>
diff --git a/app/code/Magento/Braintree/Test/Mftf/Section/StoresSubmenuSection.xml b/app/code/Magento/Braintree/Test/Mftf/Section/StoresSubmenuSection.xml
deleted file mode 100644
index f094baa9f3446..0000000000000
--- a/app/code/Magento/Braintree/Test/Mftf/Section/StoresSubmenuSection.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--->
-
-<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-    <section name="StoresSubmenuSection">
-        <element name="configuration" type="button" selector="//li[@id='menu-magento-backend-stores']//li[@data-ui-id='menu-magento-config-system-config']"/>
-    </section>
-</sections>
diff --git a/app/code/Magento/Braintree/Test/Mftf/ActionGroup/CreateNewProductActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/CreateNewProductActionGroup.xml
similarity index 84%
rename from app/code/Magento/Braintree/Test/Mftf/ActionGroup/CreateNewProductActionGroup.xml
rename to app/code/Magento/Catalog/Test/Mftf/ActionGroup/CreateNewProductActionGroup.xml
index 19de3e859ae9a..bad5eec86bc90 100644
--- a/app/code/Magento/Braintree/Test/Mftf/ActionGroup/CreateNewProductActionGroup.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/CreateNewProductActionGroup.xml
@@ -6,8 +6,8 @@
   */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-              xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
-    <actionGroup name="CreateNewProductActionGroup">
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+                 <actionGroup name="CreateNewProductActionGroup">
 
         <click stepKey="openCatalog" selector="{{AdminMenuSection.catalog}}"/>
         <waitForPageLoad stepKey="waitForCatalogSubmenu" time="5"/>
diff --git a/app/code/Magento/Braintree/Test/Mftf/ActionGroup/DeleteProductActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/DeleteProductActionGroup.xml
similarity index 86%
rename from app/code/Magento/Braintree/Test/Mftf/ActionGroup/DeleteProductActionGroup.xml
rename to app/code/Magento/Catalog/Test/Mftf/ActionGroup/DeleteProductActionGroup.xml
index 724c6d92846c4..d6f9d03271f55 100644
--- a/app/code/Magento/Braintree/Test/Mftf/ActionGroup/DeleteProductActionGroup.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/DeleteProductActionGroup.xml
@@ -6,7 +6,7 @@
   */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-              xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
     <actionGroup name="DeleteProductActionGroup">
         <arguments>
             <argument name="productName" defaultValue=""/>
diff --git a/app/code/Magento/Braintree/Test/Mftf/Data/NewProductData.xml b/app/code/Magento/Catalog/Test/Mftf/Data/NewProductData.xml
similarity index 66%
rename from app/code/Magento/Braintree/Test/Mftf/Data/NewProductData.xml
rename to app/code/Magento/Catalog/Test/Mftf/Data/NewProductData.xml
index 72661ae94076f..ff13217cbcb53 100644
--- a/app/code/Magento/Braintree/Test/Mftf/Data/NewProductData.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Data/NewProductData.xml
@@ -7,7 +7,7 @@
 -->
 
 <entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
     <entity name="NewProductData" type="braintree_config_state">
         <data key="ProductName">ProductTest</data>
         <data key="Price">100</data>
diff --git a/app/code/Magento/Braintree/Test/Mftf/Section/CatalogSubmenuSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/CatalogSubmenuSection.xml
similarity index 68%
rename from app/code/Magento/Braintree/Test/Mftf/Section/CatalogSubmenuSection.xml
rename to app/code/Magento/Catalog/Test/Mftf/Section/CatalogSubmenuSection.xml
index 32f02a69f817e..84a81c5204acc 100644
--- a/app/code/Magento/Braintree/Test/Mftf/Section/CatalogSubmenuSection.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/CatalogSubmenuSection.xml
@@ -7,7 +7,7 @@
 -->
 
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
     <section name="CatalogSubmenuSection">
         <element name="products" type="button" selector="//li[@id='menu-magento-catalog-catalog']//li[@data-ui-id='menu-magento-catalog-catalog-products']"/>
     </section>
diff --git a/app/code/Magento/Braintree/Test/Mftf/Section/NewProductPageSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/NewProductPageSection.xml
similarity index 81%
rename from app/code/Magento/Braintree/Test/Mftf/Section/NewProductPageSection.xml
rename to app/code/Magento/Catalog/Test/Mftf/Section/NewProductPageSection.xml
index 42e451940c91b..b98bd47b54132 100644
--- a/app/code/Magento/Braintree/Test/Mftf/Section/NewProductPageSection.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/NewProductPageSection.xml
@@ -7,7 +7,7 @@
 -->
 
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
     <section name="NewProductPageSection">
         <element name="productName" type="input" selector="//input[@name='product[name]']"/>
         <element name="sku" type="input" selector="//input[@name='product[sku]']"/>
diff --git a/app/code/Magento/Braintree/Test/Mftf/Section/ProductsPageSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/ProductsPageSection.xml
similarity index 84%
rename from app/code/Magento/Braintree/Test/Mftf/Section/ProductsPageSection.xml
rename to app/code/Magento/Catalog/Test/Mftf/Section/ProductsPageSection.xml
index 267efdf3d0e5e..6cf56f7baacae 100644
--- a/app/code/Magento/Braintree/Test/Mftf/Section/ProductsPageSection.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/ProductsPageSection.xml
@@ -7,7 +7,7 @@
 -->
 
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
     <section name="ProductsPageSection">
         <element name="addProductButton" type="button" selector="//button[@id='add_new_product-button']"/>
         <element name="checkboxForProduct" type="button" selector="//*[contains(text(),'{{args}}')]/parent::td/preceding-sibling::td/label[@class='data-grid-checkbox-cell-inner']" parameterized="true"/>
diff --git a/app/code/Magento/Braintree/Test/Mftf/ActionGroup/CreateCustomerActionGroup.xml b/app/code/Magento/Customer/Test/Mftf/ActionGroup/CreateCustomerActionGroup.xml
similarity index 94%
rename from app/code/Magento/Braintree/Test/Mftf/ActionGroup/CreateCustomerActionGroup.xml
rename to app/code/Magento/Customer/Test/Mftf/ActionGroup/CreateCustomerActionGroup.xml
index a68042127ec48..de24616b8adc9 100644
--- a/app/code/Magento/Braintree/Test/Mftf/ActionGroup/CreateCustomerActionGroup.xml
+++ b/app/code/Magento/Customer/Test/Mftf/ActionGroup/CreateCustomerActionGroup.xml
@@ -6,7 +6,7 @@
   */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-              xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
     <actionGroup name="CreateCustomerActionGroup">
         <click stepKey="openCustomers" selector="{{AdminMenuSection.customers}}"/>
         <waitForAjaxLoad stepKey="waitForCatalogSubmenu" time="5"/>
diff --git a/app/code/Magento/Braintree/Test/Mftf/ActionGroup/DeleteCustomerActionGroup.xml b/app/code/Magento/Customer/Test/Mftf/ActionGroup/DeleteCustomerActionGroup.xml
similarity index 100%
rename from app/code/Magento/Braintree/Test/Mftf/ActionGroup/DeleteCustomerActionGroup.xml
rename to app/code/Magento/Customer/Test/Mftf/ActionGroup/DeleteCustomerActionGroup.xml
diff --git a/app/code/Magento/Braintree/Test/Mftf/ActionGroup/SwitchAccountActionGroup.xml b/app/code/Magento/Customer/Test/Mftf/ActionGroup/SwitchAccountActionGroup.xml
similarity index 85%
rename from app/code/Magento/Braintree/Test/Mftf/ActionGroup/SwitchAccountActionGroup.xml
rename to app/code/Magento/Customer/Test/Mftf/ActionGroup/SwitchAccountActionGroup.xml
index 7c774a634b369..c3963f3dbef97 100644
--- a/app/code/Magento/Braintree/Test/Mftf/ActionGroup/SwitchAccountActionGroup.xml
+++ b/app/code/Magento/Customer/Test/Mftf/ActionGroup/SwitchAccountActionGroup.xml
@@ -6,8 +6,7 @@
   */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-              xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
-
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
     <!--Sign out-->
     <actionGroup name="SignOut">
         <click selector="{{SignOutSection.admin}}" stepKey="clickToAdminProfile"/>
diff --git a/app/code/Magento/Braintree/Test/Mftf/Data/NewCustomerData.xml b/app/code/Magento/Customer/Test/Mftf/Data/NewCustomerData.xml
similarity index 77%
rename from app/code/Magento/Braintree/Test/Mftf/Data/NewCustomerData.xml
rename to app/code/Magento/Customer/Test/Mftf/Data/NewCustomerData.xml
index 30345ec31bacd..9c1e7c48a74a2 100644
--- a/app/code/Magento/Braintree/Test/Mftf/Data/NewCustomerData.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Data/NewCustomerData.xml
@@ -7,7 +7,7 @@
 -->
 
 <entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
     <entity name="NewCustomerData" type="braintree_config_state">
         <data key="FirstName">Abgar</data>
         <data key="LastName">Abgaryan</data>
diff --git a/app/code/Magento/Braintree/Test/Mftf/Section/AdminCreateUserSection.xml b/app/code/Magento/Customer/Test/Mftf/Section/AdminCreateUserSection.xml
similarity index 82%
rename from app/code/Magento/Braintree/Test/Mftf/Section/AdminCreateUserSection.xml
rename to app/code/Magento/Customer/Test/Mftf/Section/AdminCreateUserSection.xml
index 98d748b5a30ea..9eaf0ae33d15b 100644
--- a/app/code/Magento/Braintree/Test/Mftf/Section/AdminCreateUserSection.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Section/AdminCreateUserSection.xml
@@ -5,7 +5,8 @@
   * See COPYING.txt for license details.
   */
 -->
-<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
     <section name="AdminCreateUserSection">
         <element name="system" type="input" selector="#menu-magento-backend-system"/>
         <element name="allUsers" type="input" selector="//span[contains(text(), 'All Users')]"/>
diff --git a/app/code/Magento/Braintree/Test/Mftf/Section/AdminDeleteUserSection.xml b/app/code/Magento/Customer/Test/Mftf/Section/AdminDeleteUserSection.xml
similarity index 69%
rename from app/code/Magento/Braintree/Test/Mftf/Section/AdminDeleteUserSection.xml
rename to app/code/Magento/Customer/Test/Mftf/Section/AdminDeleteUserSection.xml
index bf2e2b44eb602..af48b8f78216a 100644
--- a/app/code/Magento/Braintree/Test/Mftf/Section/AdminDeleteUserSection.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Section/AdminDeleteUserSection.xml
@@ -5,7 +5,8 @@
   * See COPYING.txt for license details.
   */
 -->
-<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
     <section name="AdminDeleteUserSection">
         <element name="theUser" selector="//td[contains(text(), 'John')]" type="button"/>
         <element name="password" selector="#user_current_password" type="input"/>
diff --git a/app/code/Magento/Braintree/Test/Mftf/Section/AdminUserGridSection.xml b/app/code/Magento/Customer/Test/Mftf/Section/AdminUserGridSection.xml
similarity index 75%
rename from app/code/Magento/Braintree/Test/Mftf/Section/AdminUserGridSection.xml
rename to app/code/Magento/Customer/Test/Mftf/Section/AdminUserGridSection.xml
index 9564bc61f799c..9f51822684254 100644
--- a/app/code/Magento/Braintree/Test/Mftf/Section/AdminUserGridSection.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Section/AdminUserGridSection.xml
@@ -5,7 +5,8 @@
   * See COPYING.txt for license details.
   */
 -->
-<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
     <section name="AdminUserGridSection">
         <element name="usernameFilterTextField" type="input" selector="#permissionsUserGrid_filter_username"/>
         <element name="searchButton" type="button" selector=".admin__data-grid-header button[title=Search]"/>
diff --git a/app/code/Magento/Braintree/Test/Mftf/Section/CustomersPageSection.xml b/app/code/Magento/Customer/Test/Mftf/Section/CustomersPageSection.xml
similarity index 84%
rename from app/code/Magento/Braintree/Test/Mftf/Section/CustomersPageSection.xml
rename to app/code/Magento/Customer/Test/Mftf/Section/CustomersPageSection.xml
index e4a75b1b6a842..60c635387199a 100644
--- a/app/code/Magento/Braintree/Test/Mftf/Section/CustomersPageSection.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Section/CustomersPageSection.xml
@@ -7,7 +7,7 @@
 -->
 
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
     <section name="CustomersPageSection">
         <element name="addNewCustomerButton" type="button" selector="//*[@id='add']"/>
         <element name="customerCheckbox" type="button" selector="//*[contains(text(),'{{args}}')]/parent::td/preceding-sibling::td/label[@class='data-grid-checkbox-cell-inner']" parameterized="true"/>
diff --git a/app/code/Magento/Braintree/Test/Mftf/Section/CustomersSubmenuSection.xml b/app/code/Magento/Customer/Test/Mftf/Section/CustomersSubmenuSection.xml
similarity index 68%
rename from app/code/Magento/Braintree/Test/Mftf/Section/CustomersSubmenuSection.xml
rename to app/code/Magento/Customer/Test/Mftf/Section/CustomersSubmenuSection.xml
index 937afb83da96f..6eeef1ba9daf0 100644
--- a/app/code/Magento/Braintree/Test/Mftf/Section/CustomersSubmenuSection.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Section/CustomersSubmenuSection.xml
@@ -7,7 +7,7 @@
 -->
 
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
     <section name="CustomersSubmenuSection">
         <element name="allCustomers" type="button" selector="//li[@id='menu-magento-customer-customer']//li[@data-ui-id='menu-magento-customer-customer-manage']"/>
     </section>
diff --git a/app/code/Magento/Braintree/Test/Mftf/Section/NewCustomerPageSection.xml b/app/code/Magento/Customer/Test/Mftf/Section/NewCustomerPageSection.xml
similarity index 92%
rename from app/code/Magento/Braintree/Test/Mftf/Section/NewCustomerPageSection.xml
rename to app/code/Magento/Customer/Test/Mftf/Section/NewCustomerPageSection.xml
index d302f9c7d0cba..db11f2d260b15 100644
--- a/app/code/Magento/Braintree/Test/Mftf/Section/NewCustomerPageSection.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Section/NewCustomerPageSection.xml
@@ -7,7 +7,7 @@
 -->
 
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
     <section name="NewCustomerPageSection">
         <element name="associateToWebsite" type="select" selector="//*[@class='admin__field-control _with-tooltip']//*[@class='admin__control-select']"/>
         <element name="group" type="select" selector="//div[@class='admin__field-control admin__control-fields required']//div[@class='admin__field-control']//select[@class='admin__control-select']"/>
diff --git a/app/code/Magento/Braintree/Test/Mftf/Section/SwitchAccountSection.xml b/app/code/Magento/Customer/Test/Mftf/Section/SwitchAccountSection.xml
similarity index 78%
rename from app/code/Magento/Braintree/Test/Mftf/Section/SwitchAccountSection.xml
rename to app/code/Magento/Customer/Test/Mftf/Section/SwitchAccountSection.xml
index 3a07cbc6dd145..e7655924133e1 100644
--- a/app/code/Magento/Braintree/Test/Mftf/Section/SwitchAccountSection.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Section/SwitchAccountSection.xml
@@ -7,8 +7,7 @@
 -->
 
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
     <section name="LoginFormSection">
         <element name="username" type="input" selector="#username"/>
         <element name="password" type="input" selector="#login"/>
diff --git a/app/code/Magento/Braintree/Test/Mftf/ActionGroup/CreateNewOrderActionGroup.xml b/app/code/Magento/Sales/Test/Mftf/ActionGroup/CreateNewOrderActionGroup.xml
similarity index 90%
rename from app/code/Magento/Braintree/Test/Mftf/ActionGroup/CreateNewOrderActionGroup.xml
rename to app/code/Magento/Sales/Test/Mftf/ActionGroup/CreateNewOrderActionGroup.xml
index 17d634c009b3e..93434471fe38f 100644
--- a/app/code/Magento/Braintree/Test/Mftf/ActionGroup/CreateNewOrderActionGroup.xml
+++ b/app/code/Magento/Sales/Test/Mftf/ActionGroup/CreateNewOrderActionGroup.xml
@@ -6,8 +6,7 @@
   */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-              xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
-
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
     <actionGroup name="useBraintreeForMasterCard">
         <click stepKey="chooseBraintree" selector="{{NewOrderSection.creditCardBraintree}}"/>
         <waitForPageLoad stepKey="waitForBraintreeConfigs" time="5"/>
diff --git a/app/code/Magento/Braintree/Test/Mftf/Section/ConfigurationListSection.xml b/app/code/Magento/Sales/Test/Mftf/Section/ConfigurationListSection.xml
similarity index 72%
rename from app/code/Magento/Braintree/Test/Mftf/Section/ConfigurationListSection.xml
rename to app/code/Magento/Sales/Test/Mftf/Section/ConfigurationListSection.xml
index 100407438eaae..bce5f95cf78a6 100644
--- a/app/code/Magento/Braintree/Test/Mftf/Section/ConfigurationListSection.xml
+++ b/app/code/Magento/Sales/Test/Mftf/Section/ConfigurationListSection.xml
@@ -7,7 +7,7 @@
 -->
 
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
     <section name="ConfigurationListSection">
         <element name="sales" type="button" selector="//div[contains(@class, 'admin__page-nav-title title _collapsible')]/strong[text()='Sales']"/>
         <element name="salesPaymentMethods" type="button" selector="//span[text()='Payment Methods']"/>
diff --git a/app/code/Magento/Braintree/Test/Mftf/Section/NewOrderSection.xml b/app/code/Magento/Sales/Test/Mftf/Section/NewOrderSection.xml
similarity index 90%
rename from app/code/Magento/Braintree/Test/Mftf/Section/NewOrderSection.xml
rename to app/code/Magento/Sales/Test/Mftf/Section/NewOrderSection.xml
index 13f59ad2cf18e..cde46c1ad63e8 100644
--- a/app/code/Magento/Braintree/Test/Mftf/Section/NewOrderSection.xml
+++ b/app/code/Magento/Sales/Test/Mftf/Section/NewOrderSection.xml
@@ -5,7 +5,8 @@
   * See COPYING.txt for license details.
   */
 -->
-<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
     <section name="NewOrderSection">
         <element name="createNewOrder" type="button" selector="#add"/>
         <element name="customer" type="button" selector="//td[contains(text(), 'Abgar')]"/>
diff --git a/app/code/Magento/Tax/Test/Mftf/ActionGroup/AdminTaxActionGroup.xml b/app/code/Magento/Tax/Test/Mftf/ActionGroup/AdminTaxActionGroup.xml
index b3395bd4afaa9..33b1db76d09db 100644
--- a/app/code/Magento/Tax/Test/Mftf/ActionGroup/AdminTaxActionGroup.xml
+++ b/app/code/Magento/Tax/Test/Mftf/ActionGroup/AdminTaxActionGroup.xml
@@ -128,12 +128,12 @@
         <!--Select Configuration menu from Store-->
         <click selector="{{AdminMenuSection.stores}}" stepKey="clickOnSTORES" />
         <waitForPageLoad stepKey="waitForConfiguration" time="5"/>
-        <click selector="{{StoresSubmenuSection.configuration}}" stepKey="clickOnConfigurations"/>
+        <click selector="{{AdminMenuSection.configuration}}" stepKey="clickOnConfigurations"/>
         <waitForPageLoad stepKey="waitForSales" time="5"/>
         <!--Double click the same to fix flaky issue with redirection to Dashboard-->
         <click selector="{{AdminMenuSection.stores}}" stepKey="clickOnSTORES1" />
         <waitForPageLoad stepKey="waitForConfiguration1" time="5"/>
-        <click selector="{{StoresSubmenuSection.configuration}}" stepKey="clickOnConfigurations1"/>
+        <click selector="{{AdminMenuSection.configuration}}" stepKey="clickOnConfigurations1"/>
         <waitForPageLoad stepKey="waitForSales1" time="5"/>
         <!--Change default tax class for Shipping on Taxable Goods-->
         <click selector="{{ConfigurationListSection.sales}}" stepKey="clickOnSales" />
@@ -156,12 +156,12 @@
         <!--Select Configuration menu from Store-->
         <click selector="{{AdminMenuSection.stores}}" stepKey="clickOnSTORES" />
         <waitForPageLoad stepKey="waitForConfiguration" time="5"/>
-        <click selector="{{StoresSubmenuSection.configuration}}" stepKey="clickOnConfigurations"/>
+        <click selector="{{AdminMenuSection.configuration}}" stepKey="clickOnConfigurations"/>
         <waitForPageLoad stepKey="waitForSales" time="5"/>
         <!--Double click the same to fix flaky issue with redirection to Dashboard-->
         <click selector="{{AdminMenuSection.stores}}" stepKey="clickOnSTORES1" />
         <waitForPageLoad stepKey="waitForConfiguration1" time="5"/>
-        <click selector="{{StoresSubmenuSection.configuration}}" stepKey="clickOnConfigurations1"/>
+        <click selector="{{AdminMenuSection.configuration}}" stepKey="clickOnConfigurations1"/>
         <waitForPageLoad stepKey="waitForSales1" time="5"/>
         <!--Change default tax class for Shipping on Taxable Goods-->
         <click selector="{{ConfigurationListSection.sales}}" stepKey="clickOnSales" />
diff --git a/app/code/Magento/Braintree/Test/Mftf/Section/AdminCreateRoleSection.xml b/app/code/Magento/User/Test/Mftf/Section/AdminCreateRoleSection.xml
similarity index 84%
rename from app/code/Magento/Braintree/Test/Mftf/Section/AdminCreateRoleSection.xml
rename to app/code/Magento/User/Test/Mftf/Section/AdminCreateRoleSection.xml
index 1158f471d51f0..eb8344008794f 100644
--- a/app/code/Magento/Braintree/Test/Mftf/Section/AdminCreateRoleSection.xml
+++ b/app/code/Magento/User/Test/Mftf/Section/AdminCreateRoleSection.xml
@@ -5,7 +5,8 @@
   * See COPYING.txt for license details.
   */
 -->
-<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
     <section name="AdminCreateRoleSection">
         <element name="create" type="button" selector="#add"/>
         <element name="name" type="button" selector="#role_name"/>
diff --git a/app/code/Magento/Braintree/Test/Mftf/Section/AdminDeleteRoleSection.xml b/app/code/Magento/User/Test/Mftf/Section/AdminDeleteRoleSection.xml
similarity index 64%
rename from app/code/Magento/Braintree/Test/Mftf/Section/AdminDeleteRoleSection.xml
rename to app/code/Magento/User/Test/Mftf/Section/AdminDeleteRoleSection.xml
index 220c9a444b02f..d3b19a3f00bcf 100644
--- a/app/code/Magento/Braintree/Test/Mftf/Section/AdminDeleteRoleSection.xml
+++ b/app/code/Magento/User/Test/Mftf/Section/AdminDeleteRoleSection.xml
@@ -5,8 +5,9 @@
   * See COPYING.txt for license details.
   */
 -->
-<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-    <section name="AdminDeleteRoleSection">
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+<section name="AdminDeleteRoleSection">
         <element name="theRole" selector="//td[contains(text(), 'Role')]" type="button"/>
         <element name="current_pass" type="button" selector="#current_password"/>
         <element name="delete" selector="//button/span[contains(text(), 'Delete Role')]" type="button"/>
diff --git a/app/code/Magento/User/Test/Mftf/Section/AdminEditUserSection.xml b/app/code/Magento/User/Test/Mftf/Section/AdminEditUserSection.xml
index 5b866b45e2fbe..64068a0a5ef58 100644
--- a/app/code/Magento/User/Test/Mftf/Section/AdminEditUserSection.xml
+++ b/app/code/Magento/User/Test/Mftf/Section/AdminEditUserSection.xml
@@ -5,8 +5,12 @@
   * See COPYING.txt for license details.
   */
 -->
-<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
     <section name="AdminEditUserSection">
+        <element name="system" type="input" selector="#menu-magento-backend-system"/>
+        <element name="allUsers" type="input" selector="//span[contains(text(), 'All Users')]"/>
+        <element name="create" type="input" selector="#add"/>
         <element name="usernameTextField" type="input" selector="#user_username"/>
         <element name="firstNameTextField" type="input" selector="#user_firstname"/>
         <element name="lastNameTextField" type="input" selector="#user_lastname"/>

From 60efe627c36390f68e130f0ceae87b1f6518bbc9 Mon Sep 17 00:00:00 2001
From: Devagouda Patil <depatil@ip-192-168-1-15.ec2.internal>
Date: Wed, 19 Dec 2018 19:30:02 +0530
Subject: [PATCH 23/70] MC-5593: [Modularity] Braintree module MFTF contain
 wide used sections and action groups - removed unwanted wait paramateres from
 waitForPageLoad

---
 .../CreateAnAdminOrderUsingBraintreePaymentTest1.xml   |  4 ++--
 .../Mftf/ActionGroup/CreateNewOrderActionGroup.xml     | 10 +++-------
 2 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/app/code/Magento/Braintree/Test/Mftf/Test/CreateAnAdminOrderUsingBraintreePaymentTest1.xml b/app/code/Magento/Braintree/Test/Mftf/Test/CreateAnAdminOrderUsingBraintreePaymentTest1.xml
index 2ddefa40b536c..35d03d69b662f 100644
--- a/app/code/Magento/Braintree/Test/Mftf/Test/CreateAnAdminOrderUsingBraintreePaymentTest1.xml
+++ b/app/code/Magento/Braintree/Test/Mftf/Test/CreateAnAdminOrderUsingBraintreePaymentTest1.xml
@@ -74,8 +74,8 @@
         <actionGroup ref="useBraintreeForMasterCard" stepKey="selectCardWithBraintree"/>
 
         <click stepKey="submitOrder" selector="{{NewOrderSection.submitOrder}}"/>
-        <waitForPageLoad stepKey="waitForSaveConfig" time="5"/>
-        <waitForElementVisible selector="{{NewOrderSection.successMessage}}" stepKey="waitForSuccessMessage" time="1"/>
+        <waitForPageLoad stepKey="waitForSaveConfig"/>
+        <waitForElementVisible selector="{{NewOrderSection.successMessage}}" stepKey="waitForSuccessMessage"/>
 
         <after>
             <!-- Disable BrainTree -->
diff --git a/app/code/Magento/Sales/Test/Mftf/ActionGroup/CreateNewOrderActionGroup.xml b/app/code/Magento/Sales/Test/Mftf/ActionGroup/CreateNewOrderActionGroup.xml
index 93434471fe38f..2c549d5c01cf2 100644
--- a/app/code/Magento/Sales/Test/Mftf/ActionGroup/CreateNewOrderActionGroup.xml
+++ b/app/code/Magento/Sales/Test/Mftf/ActionGroup/CreateNewOrderActionGroup.xml
@@ -9,30 +9,26 @@
               xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
     <actionGroup name="useBraintreeForMasterCard">
         <click stepKey="chooseBraintree" selector="{{NewOrderSection.creditCardBraintree}}"/>
-        <waitForPageLoad stepKey="waitForBraintreeConfigs" time="5"/>
+        <waitForPageLoad stepKey="waitForBraintreeConfigs"/>
         <click stepKey="openCardTypes" selector="{{NewOrderSection.openCardTypes}}"/>
-        <waitForPageLoad stepKey="waitForCardTypes" time="3"/>
+        <waitForPageLoad stepKey="waitForCardTypes"/>
         <click stepKey="chooseCardType" selector="{{NewOrderSection.masterCard}}"/>
-        <waitForPageLoad stepKey="waitForCardSelected" time="3"/>
+        <waitForPageLoad stepKey="waitForCardSelected"/>
 
         <switchToIFrame stepKey="switchToCardNumber" selector="{{NewOrderSection.cardFrame}}"/>
         <fillField stepKey="fillCardNumber" selector="{{NewOrderSection.creditCardNumber}}" userInput="{{PaymentAndShippingInfo.cardNumber}}"/>
-        <waitForPageLoad stepKey="waitForFillCardNumber" time="1"/>
         <switchToIFrame stepKey="switchBackFromCard"/>
 
         <switchToIFrame stepKey="switchToExpirationMonth" selector="{{NewOrderSection.monthFrame}}"/>
         <fillField stepKey="fillMonth" selector="{{NewOrderSection.expirationMonth}}" userInput="{{PaymentAndShippingInfo.month}}"/>
-        <waitForPageLoad stepKey="waitForFillMonth" time="1"/>
         <switchToIFrame stepKey="switchBackFromMonth"/>
 
         <switchToIFrame stepKey="switchToExpirationYear" selector="{{NewOrderSection.yearFrame}}"/>
         <fillField stepKey="fillYear" selector="{{NewOrderSection.expirationYear}}" userInput="{{PaymentAndShippingInfo.year}}"/>
-        <waitForPageLoad stepKey="waitForFillYear" time="1"/>
         <switchToIFrame stepKey="switchBackFromYear"/>
 
         <switchToIFrame stepKey="switchToCVV" selector="{{NewOrderSection.cvvFrame}}"/>
         <fillField stepKey="fillCVV" selector="{{NewOrderSection.cvv}}" userInput="{{PaymentAndShippingInfo.cvv}}"/>
-        <wait stepKey="waitForFillCVV" time="1"/>
         <switchToIFrame stepKey="switchBackFromCVV"/>
     </actionGroup>
 </actionGroups>
\ No newline at end of file

From f13a71a3a585cbcc8698eb7a00a440a8f5b237c2 Mon Sep 17 00:00:00 2001
From: Oleksandr Miroshnichenko <omiroshnichenko@magento.com>
Date: Wed, 19 Dec 2018 15:57:10 -0600
Subject: [PATCH 24/70] MC-5545: RSS feed works only from cache

---
 .../Magento/Catalog/Block/Adminhtml/Rss/NotifyStock.php    | 6 +++---
 .../Test/Unit/Block/Adminhtml/Rss/NotifyStockTest.php      | 7 ++++++-
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Rss/NotifyStock.php b/app/code/Magento/Catalog/Block/Adminhtml/Rss/NotifyStock.php
index ac1fd8c692ed2..eb6da28d268f7 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Rss/NotifyStock.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Rss/NotifyStock.php
@@ -54,8 +54,8 @@ protected function _construct()
      */
     public function getRssData()
     {
-        $newUrl = $this->rssUrlBuilder->getUrl(['_secure' => true, '_nosecret' => true, 'type' => 'notifystock']);
-        $title = __('Low Stock Products');
+         $newUrl = $this->rssUrlBuilder->getUrl(['_secure' => true, '_nosecret' => true, 'type' => 'notifystock']);
+        $title = __('Low Stock Products')->render();
         $data = ['title' => $title, 'description' => $title, 'link' => $newUrl, 'charset' => 'UTF-8'];
 
         foreach ($this->rssModel->getProductsCollection() as $item) {
@@ -65,7 +65,7 @@ public function getRssData()
                 ['id' => $item->getId(), '_secure' => true, '_nosecret' => true]
             );
             $qty = 1 * $item->getQty();
-            $description = __('%1 has reached a quantity of %2.', $item->getName(), $qty);
+            $description = __('%1 has reached a quantity of %2.', $item->getName(), $qty)->render();
             $data['entries'][] = ['title' => $item->getName(), 'link' => $url, 'description' => $description];
         }
 
diff --git a/app/code/Magento/Catalog/Test/Unit/Block/Adminhtml/Rss/NotifyStockTest.php b/app/code/Magento/Catalog/Test/Unit/Block/Adminhtml/Rss/NotifyStockTest.php
index 1dd866f1fe2ca..da35d845468d5 100644
--- a/app/code/Magento/Catalog/Test/Unit/Block/Adminhtml/Rss/NotifyStockTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Block/Adminhtml/Rss/NotifyStockTest.php
@@ -96,7 +96,12 @@ public function testGetRssData()
         $this->urlBuilder->expects($this->once())->method('getUrl')
             ->with('catalog/product/edit', ['id' => 1, '_secure' => true, '_nosecret' => true])
             ->will($this->returnValue('http://magento.com/catalog/product/edit/id/1'));
-        $this->assertEquals($this->rssFeed, $this->block->getRssData());
+
+        $data = $this->block->getRssData();
+        $this->assertTrue(is_string($data['title']));
+        $this->assertTrue(is_string($data['description']));
+        $this->assertTrue(is_string($data['entries'][0]['description']));
+        $this->assertEquals($this->rssFeed, $data);
     }
 
     public function testGetCacheLifetime()

From 74cff1d78a1659cdde62017eee851708817bc56b Mon Sep 17 00:00:00 2001
From: Nikita Chubukov <nikita_chubukov@epam.com>
Date: Sat, 22 Dec 2018 15:27:46 +0300
Subject: [PATCH 25/70] MAGETWO-96413: Restricted Admin User Backend Order
 Creation Issue With B2B

- Fix functional test
---
 .../AdminCreateCustomerWithWebsiteAndStoreViewActionGroup.xml    | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminCreateCustomerWithWebsiteAndStoreViewActionGroup.xml b/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminCreateCustomerWithWebsiteAndStoreViewActionGroup.xml
index c7eb143d5e6ba..e94fc459f8190 100644
--- a/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminCreateCustomerWithWebsiteAndStoreViewActionGroup.xml
+++ b/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminCreateCustomerWithWebsiteAndStoreViewActionGroup.xml
@@ -56,6 +56,7 @@
         <fillField stepKey="FillLastName" selector="{{AdminCustomerAccountInformationSection.lastName}}" userInput="{{customerData.lastname}}"/>
         <fillField stepKey="FillEmail" selector="{{AdminCustomerAccountInformationSection.email}}" userInput="{{customerData.email}}"/>
         <selectOption stepKey="selectStoreView" selector="{{AdminCustomerAccountInformationSection.storeView}}" userInput="{{storeView}}"/>
+        <waitForElement selector="{{AdminCustomerAccountInformationSection.storeView}}" stepKey="waitForCustomerStoreViewExpand"/>
         <click selector="{{AdminCustomerAccountInformationSection.group}}" stepKey="ClickToExpandGroup"/>
         <waitForElement selector="{{AdminProductFormAdvancedPricingSection.productTierPriceGroupOrCatalogOption('Default (General)')}}" stepKey="waitForCustomerGroupExpand"/>
         <click selector="{{AdminCustomerAccountInformationSection.groupValue('Default (General)')}}" after="waitForCustomerGroupExpand" stepKey="ClickToSelectGroup"/>

From d9620c6418f3bdf832fd6cf1841fc5a62d05aa77 Mon Sep 17 00:00:00 2001
From: Arvinda kumar <arvindakumar@cedcoss.com>
Date: Thu, 27 Dec 2018 13:40:39 +0530
Subject: [PATCH 26/70] Issue fixed #19985 Send email confirmation popup close
 button area overlapping to content

Issue fixed #19985 Send email confirmation popup close button area overlapping to content
---
 .../backend/web/css/source/components/_modals_extend.less   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/design/adminhtml/Magento/backend/web/css/source/components/_modals_extend.less b/app/design/adminhtml/Magento/backend/web/css/source/components/_modals_extend.less
index 95d7f8f65fdc1..863777f18c73c 100644
--- a/app/design/adminhtml/Magento/backend/web/css/source/components/_modals_extend.less
+++ b/app/design/adminhtml/Magento/backend/web/css/source/components/_modals_extend.less
@@ -146,13 +146,13 @@
     }
 
     .action-close {
-        padding: @modal-popup__padding;
+        padding: 1rem;
 
         &:active,
         &:focus {
             background: transparent;
-            padding-right: @modal-popup__padding + (@modal-action-close__font-size - @modal-action-close__active__font-size) / 2;
-            padding-top: @modal-popup__padding + (@modal-action-close__font-size - @modal-action-close__active__font-size) / 2;
+            padding-right: 1rem;
+            padding-top: 1rem;
         }
     }
 }

From 8f4942aa1e400cc4047b7a0de5e806b6dd7ee366 Mon Sep 17 00:00:00 2001
From: Arvinda kumar <arvindakumar@cedcoss.com>
Date: Thu, 27 Dec 2018 19:59:14 +0530
Subject: [PATCH 27/70] Issue fixed #19985 Send email confirmation popup close
 button area overlapping

Issue fixed #19985 Send email confirmation popup close button area overlapping
---
 .../backend/web/css/source/components/_modals_extend.less   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/design/adminhtml/Magento/backend/web/css/source/components/_modals_extend.less b/app/design/adminhtml/Magento/backend/web/css/source/components/_modals_extend.less
index 863777f18c73c..efc747e4d714a 100644
--- a/app/design/adminhtml/Magento/backend/web/css/source/components/_modals_extend.less
+++ b/app/design/adminhtml/Magento/backend/web/css/source/components/_modals_extend.less
@@ -146,13 +146,13 @@
     }
 
     .action-close {
-        padding: 1rem;
+        padding: @modal-popup__padding - 2;
 
         &:active,
         &:focus {
             background: transparent;
-            padding-right: 1rem;
-            padding-top: 1rem;
+            padding-right: @modal-popup__padding - 2;
+            padding-top: @modal-popup__padding - 2;
         }
     }
 }

From a8d6248de08e70a4cc28dd367c67ccaf3d624566 Mon Sep 17 00:00:00 2001
From: Veronika Kurochkina <veronika_kurochkina@epam.com>
Date: Fri, 28 Dec 2018 11:14:30 +0300
Subject: [PATCH 28/70] MAGETWO-96413: Restricted Admin User Backend Order
 Creation Issue

- Update automated test script
---
 .../Test/Mftf/ActionGroup/AdminStoreGroupCreateActionGroup.xml   | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/code/Magento/Store/Test/Mftf/ActionGroup/AdminStoreGroupCreateActionGroup.xml b/app/code/Magento/Store/Test/Mftf/ActionGroup/AdminStoreGroupCreateActionGroup.xml
index 4fe5037552778..985c8765b41f3 100644
--- a/app/code/Magento/Store/Test/Mftf/ActionGroup/AdminStoreGroupCreateActionGroup.xml
+++ b/app/code/Magento/Store/Test/Mftf/ActionGroup/AdminStoreGroupCreateActionGroup.xml
@@ -38,6 +38,7 @@
         <click selector="{{AdminStoresGridSection.storeGrpNameInFirstRow}}" stepKey="clickEditExistingStoreRow"/>
         <waitForPageLoad stepKey="waitForStoreGroupPageLoad" />
         <selectOption selector="{{AdminNewStoreGroupSection.storeGrpWebsiteDropdown}}" userInput="{{website.name}}" stepKey="selectWebsite" />
+        <selectOption selector="{{AdminNewStoreGroupSection.storeRootCategoryDropdown}}" userInput="Default Category" stepKey="chooseRootCategory" />
         <click selector="{{AdminNewStoreGroupActionsSection.saveButton}}" stepKey="clickSaveStoreGroup" />
         <waitForElementVisible selector="{{AdminStoresGridSection.storeFilterTextField}}" stepKey="waitForPageReload"/>
         <see userInput="You saved the store." stepKey="seeSavedMessage" />

From 37cc52496181707c0203195f32484316547c8b05 Mon Sep 17 00:00:00 2001
From: Veronika Kurochkina <veronika_kurochkina@epam.com>
Date: Fri, 28 Dec 2018 16:14:03 +0300
Subject: [PATCH 29/70] MAGETWO-96413: Restricted Admin User Backend Order
 Creation Issue

- Update automated test script
---
 .../Test/Mftf/ActionGroup/AdminStoreGroupCreateActionGroup.xml  | 2 ++
 .../Store/Test/Mftf/Section/AdminNewStoreGroupSection.xml       | 1 +
 2 files changed, 3 insertions(+)

diff --git a/app/code/Magento/Store/Test/Mftf/ActionGroup/AdminStoreGroupCreateActionGroup.xml b/app/code/Magento/Store/Test/Mftf/ActionGroup/AdminStoreGroupCreateActionGroup.xml
index 985c8765b41f3..f758c0af320a7 100644
--- a/app/code/Magento/Store/Test/Mftf/ActionGroup/AdminStoreGroupCreateActionGroup.xml
+++ b/app/code/Magento/Store/Test/Mftf/ActionGroup/AdminStoreGroupCreateActionGroup.xml
@@ -40,6 +40,8 @@
         <selectOption selector="{{AdminNewStoreGroupSection.storeGrpWebsiteDropdown}}" userInput="{{website.name}}" stepKey="selectWebsite" />
         <selectOption selector="{{AdminNewStoreGroupSection.storeRootCategoryDropdown}}" userInput="Default Category" stepKey="chooseRootCategory" />
         <click selector="{{AdminNewStoreGroupActionsSection.saveButton}}" stepKey="clickSaveStoreGroup" />
+        <waitForElementVisible selector="{{AdminNewStoreGroupSection.acceptNewStoreGroupCreation}}" stepKey="waitForAcceptNewStoreGroupCreationButton" />
+        <conditionalClick selector="{{AdminNewStoreGroupSection.acceptNewStoreGroupCreation}}" dependentSelector="{{AdminNewStoreGroupSection.acceptNewStoreGroupCreation}}" visible="true" stepKey="clickAcceptNewStoreGroupCreationButton"/>
         <waitForElementVisible selector="{{AdminStoresGridSection.storeFilterTextField}}" stepKey="waitForPageReload"/>
         <see userInput="You saved the store." stepKey="seeSavedMessage" />
     </actionGroup>
diff --git a/app/code/Magento/Store/Test/Mftf/Section/AdminNewStoreGroupSection.xml b/app/code/Magento/Store/Test/Mftf/Section/AdminNewStoreGroupSection.xml
index ea5d9aab8b26d..fb98c66983776 100644
--- a/app/code/Magento/Store/Test/Mftf/Section/AdminNewStoreGroupSection.xml
+++ b/app/code/Magento/Store/Test/Mftf/Section/AdminNewStoreGroupSection.xml
@@ -11,5 +11,6 @@
         <element name="storeGrpNameTextField" type="input" selector="#group_name"/>
         <element name="storeGrpCodeTextField" type="input" selector="#group_code"/>
         <element name="storeRootCategoryDropdown" type="select" selector="#group_root_category_id"/>
+        <element name="acceptNewStoreGroupCreation" type="button" selector=".action-primary.action-accept" />
     </section>
 </sections>

From ff7931b2623ae41d1c2d5a028e469c84ac62a346 Mon Sep 17 00:00:00 2001
From: Amrit Man Shrestha <1658188+amritms@users.noreply.github.com>
Date: Sun, 30 Dec 2018 18:26:28 +0545
Subject: [PATCH 30/70] Update README.md

removes extra dot on "How to run Magento"
---
 phpserver/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/phpserver/README.md b/phpserver/README.md
index 6bb814fe5f5f2..63436c8af7883 100644
--- a/phpserver/README.md
+++ b/phpserver/README.md
@@ -31,7 +31,7 @@ For more informations about the installation process using the CLI, you can cons
 
 ### How to run Magento
 
-Example usage: ```php -S 127.0.0.1:8082 -t ./pub/ ../phpserver/router.php```
+Example usage: ```php -S 127.0.0.1:8082 -t ./pub/ ./phpserver/router.php```
 
 ### What exactly the script does
 

From 53943f8db1b8a13817249335c52b8f8695d930a2 Mon Sep 17 00:00:00 2001
From: Kajal Solanki <kajal.solanki@krishtechnolabs.com>
Date: Thu, 22 Nov 2018 17:58:34 +0530
Subject: [PATCH 31/70] Fix issue 19052- Position order showing before the text
 box

---
 .../backend/Magento_Catalog/web/css/source/_module.less   | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/app/design/adminhtml/Magento/backend/Magento_Catalog/web/css/source/_module.less b/app/design/adminhtml/Magento/backend/Magento_Catalog/web/css/source/_module.less
index 3355950254072..ffbbaeb084162 100644
--- a/app/design/adminhtml/Magento/backend/Magento_Catalog/web/css/source/_module.less
+++ b/app/design/adminhtml/Magento/backend/Magento_Catalog/web/css/source/_module.less
@@ -15,6 +15,14 @@
     }
 }
 
+.catalog-category-edit {
+    .admin__grid-control {
+        .admin__grid-control-value {
+            display: none;
+        }
+    }  
+}
+
 .product-composite-configure-inner {
     .admin__control-text {
         &.qty {

From 00953bc0d052dae36b030949d9fdd6094fdfb03c Mon Sep 17 00:00:00 2001
From: Jeroen <jeroen@reachdigital.nl>
Date: Thu, 3 Jan 2019 14:29:46 +0100
Subject: [PATCH 32/70] Refactor \Order\Shipment\Save Controller to use
 ResultInterface

---
 .../Adminhtml/Order/Shipment/Save.php         | 59 ++++++++-----------
 .../Adminhtml/Order/Shipment/SaveTest.php     | 22 +++----
 2 files changed, 30 insertions(+), 51 deletions(-)

diff --git a/app/code/Magento/Shipping/Controller/Adminhtml/Order/Shipment/Save.php b/app/code/Magento/Shipping/Controller/Adminhtml/Order/Shipment/Save.php
index 8bd64ccf82d88..3c26ae938fce3 100644
--- a/app/code/Magento/Shipping/Controller/Adminhtml/Order/Shipment/Save.php
+++ b/app/code/Magento/Shipping/Controller/Adminhtml/Order/Shipment/Save.php
@@ -1,13 +1,13 @@
 <?php
 /**
- *
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Shipping\Controller\Adminhtml\Order\Shipment;
 
-use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface;
-use Magento\Backend\App\Action;
+use Magento\Framework\App\Action\HttpPostActionInterface;
+use Magento\Framework\Controller\ResultFactory;
 use Magento\Sales\Model\Order\Shipment\Validation\QuantityValidator;
 
 /**
@@ -48,17 +48,22 @@ class Save extends \Magento\Backend\App\Action implements HttpPostActionInterfac
      * @param \Magento\Shipping\Controller\Adminhtml\Order\ShipmentLoader $shipmentLoader
      * @param \Magento\Shipping\Model\Shipping\LabelGenerator $labelGenerator
      * @param \Magento\Sales\Model\Order\Email\Sender\ShipmentSender $shipmentSender
+     * @param \Magento\Sales\Model\Order\Shipment\ShipmentValidatorInterface|null $shipmentValidator
      */
     public function __construct(
         \Magento\Backend\App\Action\Context $context,
         \Magento\Shipping\Controller\Adminhtml\Order\ShipmentLoader $shipmentLoader,
         \Magento\Shipping\Model\Shipping\LabelGenerator $labelGenerator,
-        \Magento\Sales\Model\Order\Email\Sender\ShipmentSender $shipmentSender
+        \Magento\Sales\Model\Order\Email\Sender\ShipmentSender $shipmentSender,
+        \Magento\Sales\Model\Order\Shipment\ShipmentValidatorInterface $shipmentValidator = null
     ) {
+        parent::__construct($context);
+
         $this->shipmentLoader = $shipmentLoader;
         $this->labelGenerator = $labelGenerator;
         $this->shipmentSender = $shipmentSender;
-        parent::__construct($context);
+        $this->shipmentValidator = $shipmentValidator ?: \Magento\Framework\App\ObjectManager::getInstance()
+            ->get(\Magento\Sales\Model\Order\Shipment\ShipmentValidatorInterface::class);
     }
 
     /**
@@ -86,7 +91,7 @@ protected function _saveShipment($shipment)
      * Save shipment
      * We can save only new shipment. Existing shipments are not editable
      *
-     * @return void
+     * @return \Magento\Backend\Model\View\Result\Redirect
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
      */
@@ -98,7 +103,7 @@ public function execute()
         $formKeyIsValid = $this->_formKeyValidator->validate($this->getRequest());
         $isPost = $this->getRequest()->isPost();
         if (!$formKeyIsValid || !$isPost) {
-            $this->messageManager->addError(__('We can\'t save the shipment right now.'));
+            $this->messageManager->addErrorMessage(__('We can\'t save the shipment right now.'));
             return $resultRedirect->setPath('sales/order/index');
         }
 
@@ -118,8 +123,7 @@ public function execute()
             $this->shipmentLoader->setTracking($this->getRequest()->getParam('tracking'));
             $shipment = $this->shipmentLoader->load();
             if (!$shipment) {
-                $this->_forward('noroute');
-                return;
+                return $this->resultFactory->create(ResultFactory::TYPE_FORWARD)->forward('noroute');
             }
 
             if (!empty($data['comment_text'])) {
@@ -132,15 +136,13 @@ public function execute()
                 $shipment->setCustomerNote($data['comment_text']);
                 $shipment->setCustomerNoteNotify(isset($data['comment_customer_notify']));
             }
-            $validationResult = $this->getShipmentValidator()
-                ->validate($shipment, [QuantityValidator::class]);
+            $validationResult = $this->shipmentValidator->validate($shipment, [QuantityValidator::class]);
 
             if ($validationResult->hasMessages()) {
-                $this->messageManager->addError(
+                $this->messageManager->addErrorMessage(
                     __("Shipment Document Validation Error(s):\n" . implode("\n", $validationResult->getMessages()))
                 );
-                $this->_redirect('*/*/new', ['order_id' => $this->getRequest()->getParam('order_id')]);
-                return;
+                return $resultRedirect->setPath('*/*/new', ['order_id' => $this->getRequest()->getParam('order_id')]);
             }
             $shipment->register();
 
@@ -160,7 +162,7 @@ public function execute()
             $shipmentCreatedMessage = __('The shipment has been created.');
             $labelCreatedMessage = __('You created the shipping label.');
 
-            $this->messageManager->addSuccess(
+            $this->messageManager->addSuccessMessage(
                 $isNeedCreateLabel ? $shipmentCreatedMessage . ' ' . $labelCreatedMessage : $shipmentCreatedMessage
             );
             $this->_objectManager->get(\Magento\Backend\Model\Session::class)->getCommentText(true);
@@ -169,8 +171,8 @@ public function execute()
                 $responseAjax->setError(true);
                 $responseAjax->setMessage($e->getMessage());
             } else {
-                $this->messageManager->addError($e->getMessage());
-                $this->_redirect('*/*/new', ['order_id' => $this->getRequest()->getParam('order_id')]);
+                $this->messageManager->addErrorMessage($e->getMessage());
+                return $resultRedirect->setPath('*/*/new', ['order_id' => $this->getRequest()->getParam('order_id')]);
             }
         } catch (\Exception $e) {
             $this->_objectManager->get(\Psr\Log\LoggerInterface::class)->critical($e);
@@ -178,29 +180,14 @@ public function execute()
                 $responseAjax->setError(true);
                 $responseAjax->setMessage(__('An error occurred while creating shipping label.'));
             } else {
-                $this->messageManager->addError(__('Cannot save shipment.'));
-                $this->_redirect('*/*/new', ['order_id' => $this->getRequest()->getParam('order_id')]);
+                $this->messageManager->addErrorMessage(__('Cannot save shipment.'));
+                return $resultRedirect->setPath('*/*/new', ['order_id' => $this->getRequest()->getParam('order_id')]);
             }
         }
         if ($isNeedCreateLabel) {
-            $this->getResponse()->representJson($responseAjax->toJson());
-        } else {
-            $this->_redirect('sales/order/view', ['order_id' => $shipment->getOrderId()]);
-        }
-    }
-
-    /**
-     * @return \Magento\Sales\Model\Order\Shipment\ShipmentValidatorInterface
-     * @deprecated 100.1.1
-     */
-    private function getShipmentValidator()
-    {
-        if ($this->shipmentValidator === null) {
-            $this->shipmentValidator = $this->_objectManager->get(
-                \Magento\Sales\Model\Order\Shipment\ShipmentValidatorInterface::class
-            );
+            return $this->resultFactory->create(ResultFactory::TYPE_JSON)->setJsonData($responseAjax->toJson());
         }
 
-        return $this->shipmentValidator;
+        return $resultRedirect->setPath('sales/order/view', ['order_id' => $shipment->getOrderId()]);
     }
 }
diff --git a/app/code/Magento/Shipping/Test/Unit/Controller/Adminhtml/Order/Shipment/SaveTest.php b/app/code/Magento/Shipping/Test/Unit/Controller/Adminhtml/Order/Shipment/SaveTest.php
index f841728416f82..c253900501d18 100644
--- a/app/code/Magento/Shipping/Test/Unit/Controller/Adminhtml/Order/Shipment/SaveTest.php
+++ b/app/code/Magento/Shipping/Test/Unit/Controller/Adminhtml/Order/Shipment/SaveTest.php
@@ -142,7 +142,7 @@ protected function setUp()
         );
         $this->messageManager = $this->createPartialMock(
             \Magento\Framework\Message\Manager::class,
-            ['addSuccess', 'addError']
+            ['addSuccessMessage', 'addErrorMessage']
         );
         $this->session = $this->createPartialMock(
             \Magento\Backend\Model\Session::class,
@@ -236,7 +236,7 @@ public function testExecute($formKeyIsValid, $isPost)
 
         if (!$formKeyIsValid || !$isPost) {
             $this->messageManager->expects($this->once())
-                ->method('addError');
+                ->method('addErrorMessage');
 
             $this->resultRedirect->expects($this->once())
                 ->method('setPath')
@@ -325,12 +325,11 @@ public function testExecute($formKeyIsValid, $isPost)
                 ->method('get')
                 ->with(\Magento\Backend\Model\Session::class)
                 ->will($this->returnValue($this->session));
-            $path = 'sales/order/view';
             $arguments = ['order_id' => $orderId];
             $shipment->expects($this->once())
                 ->method('getOrderId')
                 ->will($this->returnValue($orderId));
-            $this->prepareRedirect($path, $arguments);
+            $this->prepareRedirect($arguments);
 
             $this->shipmentValidatorMock->expects($this->once())
                 ->method('validate')
@@ -360,10 +359,9 @@ public function executeDataProvider()
     }
 
     /**
-     * @param string $path
      * @param array $arguments
      */
-    protected function prepareRedirect($path, array $arguments = [])
+    protected function prepareRedirect(array $arguments = [])
     {
         $this->actionFlag->expects($this->any())
             ->method('get')
@@ -372,14 +370,8 @@ protected function prepareRedirect($path, array $arguments = [])
         $this->session->expects($this->any())
             ->method('setIsUrlNotice')
             ->with(true);
-
-        $url = $path . '/' . (!empty($arguments) ? $arguments['order_id'] : '');
-        $this->helper->expects($this->atLeastOnce())
-            ->method('getUrl')
-            ->with($path, $arguments)
-            ->will($this->returnValue($url));
-        $this->response->expects($this->atLeastOnce())
-            ->method('setRedirect')
-            ->with($url);
+        $this->resultRedirect->expects($this->once())
+            ->method('setPath')
+            ->with('sales/order/view', $arguments);
     }
 }

From 10e7623128681de988eb4820e1a6fe26b7a74a09 Mon Sep 17 00:00:00 2001
From: Veronika Kurochkina <veronika_kurochkina@epam.com>
Date: Thu, 10 Jan 2019 11:40:34 +0300
Subject: [PATCH 33/70] MAGETWO-96413: Restricted Admin User Backend Order
 Creation Issue

- Update automated test script
---
 .../Test/Mftf/ActionGroup/AdminStoreGroupCreateActionGroup.xml   | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/code/Magento/Store/Test/Mftf/ActionGroup/AdminStoreGroupCreateActionGroup.xml b/app/code/Magento/Store/Test/Mftf/ActionGroup/AdminStoreGroupCreateActionGroup.xml
index f758c0af320a7..1a7f24ed2aaa5 100644
--- a/app/code/Magento/Store/Test/Mftf/ActionGroup/AdminStoreGroupCreateActionGroup.xml
+++ b/app/code/Magento/Store/Test/Mftf/ActionGroup/AdminStoreGroupCreateActionGroup.xml
@@ -40,7 +40,6 @@
         <selectOption selector="{{AdminNewStoreGroupSection.storeGrpWebsiteDropdown}}" userInput="{{website.name}}" stepKey="selectWebsite" />
         <selectOption selector="{{AdminNewStoreGroupSection.storeRootCategoryDropdown}}" userInput="Default Category" stepKey="chooseRootCategory" />
         <click selector="{{AdminNewStoreGroupActionsSection.saveButton}}" stepKey="clickSaveStoreGroup" />
-        <waitForElementVisible selector="{{AdminNewStoreGroupSection.acceptNewStoreGroupCreation}}" stepKey="waitForAcceptNewStoreGroupCreationButton" />
         <conditionalClick selector="{{AdminNewStoreGroupSection.acceptNewStoreGroupCreation}}" dependentSelector="{{AdminNewStoreGroupSection.acceptNewStoreGroupCreation}}" visible="true" stepKey="clickAcceptNewStoreGroupCreationButton"/>
         <waitForElementVisible selector="{{AdminStoresGridSection.storeFilterTextField}}" stepKey="waitForPageReload"/>
         <see userInput="You saved the store." stepKey="seeSavedMessage" />

From 4b0eeb6a6d933c92416cd6eca48d720d48508d61 Mon Sep 17 00:00:00 2001
From: Milind Singh <milind7@live.com>
Date: Thu, 10 Jan 2019 17:27:15 +0530
Subject: [PATCH 34/70] Order API resources updated.

---
 app/code/Magento/Sales/etc/webapi.xml | 90 +++++++++++++--------------
 1 file changed, 45 insertions(+), 45 deletions(-)

diff --git a/app/code/Magento/Sales/etc/webapi.xml b/app/code/Magento/Sales/etc/webapi.xml
index cee245e348393..492dff8057039 100644
--- a/app/code/Magento/Sales/etc/webapi.xml
+++ b/app/code/Magento/Sales/etc/webapi.xml
@@ -10,271 +10,271 @@
     <route url="/V1/orders/:id" method="GET">
         <service class="Magento\Sales\Api\OrderRepositoryInterface" method="get"/>
         <resources>
-            <resource ref="Magento_Sales::sales" />
+            <resource ref="Magento_Sales::actions_view" />
         </resources>
     </route>
     <route url="/V1/orders" method="GET">
         <service class="Magento\Sales\Api\OrderRepositoryInterface" method="getList"/>
         <resources>
-            <resource ref="Magento_Sales::sales" />
+            <resource ref="Magento_Sales::actions_view" />
         </resources>
     </route>
     <route url="/V1/orders/:id/statuses" method="GET">
         <service class="Magento\Sales\Api\OrderManagementInterface" method="getStatus"/>
         <resources>
-            <resource ref="Magento_Sales::sales" />
+            <resource ref="Magento_Sales::actions_view" />
         </resources>
     </route>
     <route url="/V1/orders/:id/cancel" method="POST">
         <service class="Magento\Sales\Api\OrderManagementInterface" method="cancel"/>
         <resources>
-            <resource ref="Magento_Sales::sales" />
+            <resource ref="Magento_Sales::cancel" />
         </resources>
     </route>
     <route url="/V1/orders/:id/emails" method="POST">
         <service class="Magento\Sales\Api\OrderManagementInterface" method="notify"/>
         <resources>
-            <resource ref="Magento_Sales::sales" />
+            <resource ref="Magento_Sales::emails" />
         </resources>
     </route>
     <route url="/V1/orders/:id/hold" method="POST">
         <service class="Magento\Sales\Api\OrderManagementInterface" method="hold"/>
         <resources>
-            <resource ref="Magento_Sales::sales" />
+            <resource ref="Magento_Sales::hold" />
         </resources>
     </route>
     <route url="/V1/orders/:id/unhold" method="POST">
         <service class="Magento\Sales\Api\OrderManagementInterface" method="unHold"/>
         <resources>
-            <resource ref="Magento_Sales::sales" />
+            <resource ref="Magento_Sales::unhold" />
         </resources>
     </route>
     <route url="/V1/orders/:id/comments" method="POST">
         <service class="Magento\Sales\Api\OrderManagementInterface" method="addComment"/>
         <resources>
-            <resource ref="Magento_Sales::sales" />
+            <resource ref="Magento_Sales::comment" />
         </resources>
     </route>
     <route url="/V1/orders/:id/comments" method="GET">
         <service class="Magento\Sales\Api\OrderManagementInterface" method="getCommentsList"/>
         <resources>
-            <resource ref="Magento_Sales::sales" />
+            <resource ref="Magento_Sales::actions_view" />
         </resources>
     </route>
     <route url="/V1/orders/create" method="PUT">
         <service class="Magento\Sales\Api\OrderRepositoryInterface" method="save"/>
         <resources>
-            <resource ref="Magento_Sales::sales" />
+            <resource ref="Magento_Sales::create" />
         </resources>
     </route>
     <route url="/V1/orders/:parent_id" method="PUT">
         <service class="Magento\Sales\Api\OrderAddressRepositoryInterface" method="save"/>
         <resources>
-            <resource ref="Magento_Sales::sales" />
+            <resource ref="Magento_Sales::create" />
         </resources>
     </route>
     <route url="/V1/orders/items/:id" method="GET">
         <service class="Magento\Sales\Api\OrderItemRepositoryInterface" method="get"/>
         <resources>
-            <resource ref="Magento_Sales::sales" />
+            <resource ref="Magento_Sales::actions_view" />
         </resources>
     </route>
     <route url="/V1/orders/items" method="GET">
         <service class="Magento\Sales\Api\OrderItemRepositoryInterface" method="getList"/>
         <resources>
-            <resource ref="Magento_Sales::sales" />
+            <resource ref="Magento_Sales::actions_view" />
         </resources>
     </route>
     <route url="/V1/invoices/:id" method="GET">
         <service class="Magento\Sales\Api\InvoiceRepositoryInterface" method="get"/>
         <resources>
-            <resource ref="Magento_Sales::sales" />
+            <resource ref="Magento_Sales::sales_invoice" />
         </resources>
     </route>
     <route url="/V1/invoices" method="GET">
         <service class="Magento\Sales\Api\InvoiceRepositoryInterface" method="getList"/>
         <resources>
-            <resource ref="Magento_Sales::sales" />
+            <resource ref="Magento_Sales::sales_invoice" />
         </resources>
     </route>
     <route url="/V1/invoices/:id/comments" method="GET">
         <service class="Magento\Sales\Api\InvoiceManagementInterface" method="getCommentsList"/>
         <resources>
-            <resource ref="Magento_Sales::sales" />
+            <resource ref="Magento_Sales::sales_invoice" />
         </resources>
     </route>
     <route url="/V1/invoices/:id/emails" method="POST">
         <service class="Magento\Sales\Api\InvoiceManagementInterface" method="notify"/>
         <resources>
-            <resource ref="Magento_Sales::sales" />
+            <resource ref="Magento_Sales::sales_invoice" />
         </resources>
     </route>
     <route url="/V1/invoices/:id/void" method="POST">
         <service class="Magento\Sales\Api\InvoiceManagementInterface" method="setVoid"/>
         <resources>
-            <resource ref="Magento_Sales::sales" />
+            <resource ref="Magento_Sales::sales_invoice" />
         </resources>
     </route>
     <route url="/V1/invoices/:id/capture" method="POST">
         <service class="Magento\Sales\Api\InvoiceManagementInterface" method="setCapture"/>
         <resources>
-            <resource ref="Magento_Sales::sales" />
+            <resource ref="Magento_Sales::sales_invoice" />
         </resources>
     </route>
     <route url="/V1/invoices/comments" method="POST">
         <service class="Magento\Sales\Api\InvoiceCommentRepositoryInterface" method="save"/>
         <resources>
-            <resource ref="Magento_Sales::sales" />
+            <resource ref="Magento_Sales::sales_invoice" />
         </resources>
     </route>
     <route url="/V1/invoices/" method="POST">
         <service class="Magento\Sales\Api\InvoiceRepositoryInterface" method="save"/>
         <resources>
-            <resource ref="Magento_Sales::sales" />
+            <resource ref="Magento_Sales::sales_invoice" />
         </resources>
     </route>
     <route url="/V1/invoice/:invoiceId/refund" method="POST">
         <service class="Magento\Sales\Api\RefundInvoiceInterface" method="execute"/>
         <resources>
-            <resource ref="Magento_Sales::sales" />
+            <resource ref="Magento_Sales::sales_invoice" />
         </resources>
     </route>
     <route url="/V1/creditmemo/:id/comments" method="GET">
         <service class="Magento\Sales\Api\CreditmemoManagementInterface" method="getCommentsList"/>
         <resources>
-            <resource ref="Magento_Sales::sales" />
+            <resource ref="Magento_Sales::sales_creditmemo" />
         </resources>
     </route>
     <route url="/V1/creditmemos" method="GET">
         <service class="Magento\Sales\Api\CreditmemoRepositoryInterface" method="getList"/>
         <resources>
-            <resource ref="Magento_Sales::sales" />
+            <resource ref="Magento_Sales::sales_creditmemo" />
         </resources>
     </route>
     <route url="/V1/creditmemo/:id" method="GET">
         <service class="Magento\Sales\Api\CreditmemoRepositoryInterface" method="get"/>
         <resources>
-            <resource ref="Magento_Sales::sales" />
+            <resource ref="Magento_Sales::sales_creditmemo" />
         </resources>
     </route>
     <route url="/V1/creditmemo/:id" method="PUT">
         <service class="Magento\Sales\Api\CreditmemoManagementInterface" method="cancel"/>
         <resources>
-            <resource ref="Magento_Sales::sales" />
+            <resource ref="Magento_Sales::sales_creditmemo" />
         </resources>
     </route>
     <route url="/V1/creditmemo/:id/emails" method="POST">
         <service class="Magento\Sales\Api\CreditmemoManagementInterface" method="notify"/>
         <resources>
-            <resource ref="Magento_Sales::sales" />
+            <resource ref="Magento_Sales::sales_creditmemo" />
         </resources>
     </route>
     <route url="/V1/creditmemo/refund" method="POST">
         <service class="Magento\Sales\Api\CreditmemoManagementInterface" method="refund"/>
         <resources>
-            <resource ref="Magento_Sales::sales" />
+            <resource ref="Magento_Sales::sales_creditmemo" />
         </resources>
     </route>
     <route url="/V1/creditmemo/:id/comments" method="POST">
         <service class="Magento\Sales\Api\CreditmemoCommentRepositoryInterface" method="save"/>
         <resources>
-            <resource ref="Magento_Sales::sales" />
+            <resource ref="Magento_Sales::sales_creditmemo" />
         </resources>
     </route>
     <route url="/V1/creditmemo" method="POST">
         <service class="Magento\Sales\Api\CreditmemoRepositoryInterface" method="save"/>
         <resources>
-            <resource ref="Magento_Sales::sales" />
+            <resource ref="Magento_Sales::sales_creditmemo" />
         </resources>
     </route>
     <route url="/V1/order/:orderId/refund" method="POST">
         <service class="Magento\Sales\Api\RefundOrderInterface" method="execute"/>
         <resources>
-            <resource ref="Magento_Sales::sales" />
+            <resource ref="Magento_Sales::creditmemo" />
         </resources>
     </route>
     <route url="/V1/shipment/:id" method="GET">
         <service class="Magento\Sales\Api\ShipmentRepositoryInterface" method="get"/>
         <resources>
-            <resource ref="Magento_Sales::sales" />
+            <resource ref="Magento_Sales::shipment" />
         </resources>
     </route>
     <route url="/V1/shipments" method="GET">
         <service class="Magento\Sales\Api\ShipmentRepositoryInterface" method="getList"/>
         <resources>
-            <resource ref="Magento_Sales::sales" />
+            <resource ref="Magento_Sales::shipment" />
         </resources>
     </route>
     <route url="/V1/shipment/:id/comments" method="GET">
         <service class="Magento\Sales\Api\ShipmentManagementInterface" method="getCommentsList"/>
         <resources>
-            <resource ref="Magento_Sales::sales" />
+            <resource ref="Magento_Sales::shipment" />
         </resources>
     </route>
     <route url="/V1/shipment/:id/comments" method="POST">
         <service class="Magento\Sales\Api\ShipmentCommentRepositoryInterface" method="save"/>
         <resources>
-            <resource ref="Magento_Sales::sales" />
+            <resource ref="Magento_Sales::shipment" />
         </resources>
     </route>
     <route url="/V1/shipment/:id/emails" method="POST">
         <service class="Magento\Sales\Api\ShipmentManagementInterface" method="notify"/>
         <resources>
-            <resource ref="Magento_Sales::sales" />
+            <resource ref="Magento_Sales::shipment" />
         </resources>
     </route>
     <route url="/V1/shipment/track" method="POST">
         <service class="Magento\Sales\Api\ShipmentTrackRepositoryInterface" method="save"/>
         <resources>
-            <resource ref="Magento_Sales::sales" />
+            <resource ref="Magento_Sales::shipment" />
         </resources>
     </route>
     <route url="/V1/shipment/track/:id" method="DELETE">
         <service class="Magento\Sales\Api\ShipmentTrackRepositoryInterface" method="deleteById"/>
         <resources>
-            <resource ref="Magento_Sales::sales" />
+            <resource ref="Magento_Sales::shipment" />
         </resources>
     </route>
     <route url="/V1/shipment/" method="POST">
         <service class="Magento\Sales\Api\ShipmentRepositoryInterface" method="save"/>
         <resources>
-            <resource ref="Magento_Sales::sales" />
+            <resource ref="Magento_Sales::shipment" />
         </resources>
     </route>
     <route url="/V1/shipment/:id/label" method="GET">
         <service class="Magento\Sales\Api\ShipmentManagementInterface" method="getLabel"/>
         <resources>
-            <resource ref="Magento_Sales::sales" />
+            <resource ref="Magento_Sales::shipment" />
         </resources>
     </route>
     <route url="/V1/order/:orderId/ship" method="POST">
         <service class="Magento\Sales\Api\ShipOrderInterface" method="execute"/>
         <resources>
-            <resource ref="Magento_Sales::sales" />
+            <resource ref="Magento_Sales::ship" />
         </resources>
     </route>
     <route url="/V1/orders/" method="POST">
         <service class="Magento\Sales\Api\OrderRepositoryInterface" method="save"/>
         <resources>
-            <resource ref="Magento_Sales::sales" />
+            <resource ref="Magento_Sales::create" />
         </resources>
     </route>
     <route url="/V1/transactions/:id" method="GET">
         <service class="Magento\Sales\Api\TransactionRepositoryInterface" method="get"/>
         <resources>
-            <resource ref="Magento_Sales::sales" />
+            <resource ref="Magento_Sales::transactions_fetch" />
         </resources>
     </route>
     <route url="/V1/transactions" method="GET">
         <service class="Magento\Sales\Api\TransactionRepositoryInterface" method="getList"/>
         <resources>
-            <resource ref="Magento_Sales::sales" />
+            <resource ref="Magento_Sales::transactions_fetch" />
         </resources>
     </route>
     <route url="/V1/order/:orderId/invoice" method="POST">
         <service class="Magento\Sales\Api\InvoiceOrderInterface" method="execute"/>
         <resources>
-            <resource ref="Magento_Sales::sales" />
+            <resource ref="Magento_Sales::invoice" />
         </resources>
     </route>
 </routes>

From 0f527ca12ce975e4e14d3a3b3fca0f814cde36c5 Mon Sep 17 00:00:00 2001
From: Veronika Kurochkina <veronika_kurochkina@epam.com>
Date: Thu, 10 Jan 2019 16:20:12 +0300
Subject: [PATCH 35/70] MAGETWO-96413: Restricted Admin User Backend Order
 Creation Issue With B2B

- Update automated test script
---
 ...dminCreateCustomerWithWebsiteAndStoreViewActionGroup.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminCreateCustomerWithWebsiteAndStoreViewActionGroup.xml b/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminCreateCustomerWithWebsiteAndStoreViewActionGroup.xml
index e94fc459f8190..37149e23dc87e 100644
--- a/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminCreateCustomerWithWebsiteAndStoreViewActionGroup.xml
+++ b/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminCreateCustomerWithWebsiteAndStoreViewActionGroup.xml
@@ -52,14 +52,14 @@
         <amOnPage url="{{AdminCustomerPage.url}}" stepKey="goToCustomersPage"/>
         <click stepKey="addNewCustomer" selector="{{AdminCustomerGridMainActionsSection.addNewCustomer}}"/>
         <selectOption stepKey="selectWebSite" selector="{{AdminCustomerAccountInformationSection.associateToWebsite}}" userInput="{{website}}"/>
+        <click selector="{{AdminCustomerAccountInformationSection.group}}" stepKey="ClickToExpandGroup"/>
+        <waitForElement selector="{{AdminProductFormAdvancedPricingSection.productTierPriceGroupOrCatalogOption('Default (General)')}}" stepKey="waitForCustomerGroupExpand"/>
+        <click selector="{{AdminCustomerAccountInformationSection.groupValue('Default (General)')}}" after="waitForCustomerGroupExpand" stepKey="ClickToSelectGroup"/>
         <fillField stepKey="FillFirstName" selector="{{AdminCustomerAccountInformationSection.firstName}}" userInput="{{customerData.firstname}}"/>
         <fillField stepKey="FillLastName" selector="{{AdminCustomerAccountInformationSection.lastName}}" userInput="{{customerData.lastname}}"/>
         <fillField stepKey="FillEmail" selector="{{AdminCustomerAccountInformationSection.email}}" userInput="{{customerData.email}}"/>
         <selectOption stepKey="selectStoreView" selector="{{AdminCustomerAccountInformationSection.storeView}}" userInput="{{storeView}}"/>
         <waitForElement selector="{{AdminCustomerAccountInformationSection.storeView}}" stepKey="waitForCustomerStoreViewExpand"/>
-        <click selector="{{AdminCustomerAccountInformationSection.group}}" stepKey="ClickToExpandGroup"/>
-        <waitForElement selector="{{AdminProductFormAdvancedPricingSection.productTierPriceGroupOrCatalogOption('Default (General)')}}" stepKey="waitForCustomerGroupExpand"/>
-        <click selector="{{AdminCustomerAccountInformationSection.groupValue('Default (General)')}}" after="waitForCustomerGroupExpand" stepKey="ClickToSelectGroup"/>
         <click stepKey="save" selector="{{AdminCustomerAccountInformationSection.saveCustomer}}"/>
         <waitForPageLoad stepKey="waitForCustomersPage"/>
         <see stepKey="seeSuccessMessage" userInput="You saved the customer."/>

From 473f907264cbff215a645518dfc5cc75849119d1 Mon Sep 17 00:00:00 2001
From: Shikha Mishra <shikhamishra@cedcoss.com>
Date: Fri, 11 Jan 2019 08:20:24 +0530
Subject: [PATCH 36/70] Updated CancelOrderItemObserver.php

Fixed Issue #20121 Cancel order increases stock although "Set Items' Status to be In Stock When Order is Cancelled" is set to No
---
 .../Observer/CancelOrderItemObserver.php              | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/app/code/Magento/CatalogInventory/Observer/CancelOrderItemObserver.php b/app/code/Magento/CatalogInventory/Observer/CancelOrderItemObserver.php
index 1e99794d68a40..c919c7057bcc6 100644
--- a/app/code/Magento/CatalogInventory/Observer/CancelOrderItemObserver.php
+++ b/app/code/Magento/CatalogInventory/Observer/CancelOrderItemObserver.php
@@ -6,6 +6,7 @@
 
 namespace Magento\CatalogInventory\Observer;
 
+use Magento\CatalogInventory\Model\Configuration;
 use Magento\Framework\Event\ObserverInterface;
 use Magento\CatalogInventory\Api\StockManagementInterface;
 use Magento\Framework\Event\Observer as EventObserver;
@@ -15,6 +16,11 @@
  */
 class CancelOrderItemObserver implements ObserverInterface
 {
+    /**
+     * @var \Magento\CatalogInventory\Model\Configuration
+     */
+    protected $configuration;
+
     /**
      * @var StockManagementInterface
      */
@@ -30,9 +36,11 @@ class CancelOrderItemObserver implements ObserverInterface
      * @param \Magento\Catalog\Model\Indexer\Product\Price\Processor $priceIndexer
      */
     public function __construct(
+        Configuration $configuration,
         StockManagementInterface $stockManagement,
         \Magento\Catalog\Model\Indexer\Product\Price\Processor $priceIndexer
     ) {
+        $this->configuration = $configuration;
         $this->stockManagement = $stockManagement;
         $this->priceIndexer = $priceIndexer;
     }
@@ -49,7 +57,8 @@ public function execute(EventObserver $observer)
         $item = $observer->getEvent()->getItem();
         $children = $item->getChildrenItems();
         $qty = $item->getQtyOrdered() - max($item->getQtyShipped(), $item->getQtyInvoiced()) - $item->getQtyCanceled();
-        if ($item->getId() && $item->getProductId() && empty($children) && $qty) {
+        if ($item->getId() && $item->getProductId() && empty($children) && $qty && $this->configuration
+            ->getCanBackInStock()) {
             $this->stockManagement->backItemQty($item->getProductId(), $qty, $item->getStore()->getWebsiteId());
         }
         $this->priceIndexer->reindexRow($item->getProductId());

From 1204f231c0b17b0880cf4a6b4b1812d4d130e00d Mon Sep 17 00:00:00 2001
From: Ihor Sviziev <ihor-sviziev@users.noreply.github.com>
Date: Fri, 11 Jan 2019 06:40:01 +0200
Subject: [PATCH 37/70] magento/magento2: Refactor \Order\Shipment\Save
 Controller to use ResultInterface

Fix return type
---
 .../Shipping/Controller/Adminhtml/Order/Shipment/Save.php       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/Shipping/Controller/Adminhtml/Order/Shipment/Save.php b/app/code/Magento/Shipping/Controller/Adminhtml/Order/Shipment/Save.php
index 3c26ae938fce3..e36292b7c2e36 100644
--- a/app/code/Magento/Shipping/Controller/Adminhtml/Order/Shipment/Save.php
+++ b/app/code/Magento/Shipping/Controller/Adminhtml/Order/Shipment/Save.php
@@ -91,7 +91,7 @@ protected function _saveShipment($shipment)
      * Save shipment
      * We can save only new shipment. Existing shipments are not editable
      *
-     * @return \Magento\Backend\Model\View\Result\Redirect
+     * @return \Magento\Framework\Controller\ResultInterface
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
      */

From 81da50b43d5ebc12cf4e3a294f5b5a2bac6f3235 Mon Sep 17 00:00:00 2001
From: ajay-2jcommerce <ajay@2jcommerce.in>
Date: Fri, 11 Jan 2019 12:18:20 +0530
Subject: [PATCH 38/70] 
 Bundle-Product-add-to-cart-button-misaligned-on-tab-portrait ::Bundle Product
 add to cart button misaligned on tab portrait view.

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

diff --git a/app/design/frontend/Magento/luma/Magento_Bundle/web/css/source/_module.less b/app/design/frontend/Magento/luma/Magento_Bundle/web/css/source/_module.less
index 43ae23bab7895..eeb17653c877b 100644
--- a/app/design/frontend/Magento/luma/Magento_Bundle/web/css/source/_module.less
+++ b/app/design/frontend/Magento/luma/Magento_Bundle/web/css/source/_module.less
@@ -253,7 +253,7 @@
             .box-tocart {
                 .action.primary {
                     margin-right: 1%;
-                    width: 49%;
+                    width: auto;
                 }
             }
 

From 928618327fb83e52a564631e56b9e3ce3d38caef Mon Sep 17 00:00:00 2001
From: Tristan Hofman <tristan@baldwin.be>
Date: Fri, 11 Jan 2019 14:34:02 +0100
Subject: [PATCH 39/70] Las Palmas and Tenerife should be represented by Canary
 Islands in UPS

---
 .../Shipping/Model/Carrier/AbstractCarrierOnline.php      | 6 ++++++
 app/code/Magento/Ups/Model/Carrier.php                    | 8 ++++++++
 2 files changed, 14 insertions(+)

diff --git a/app/code/Magento/Shipping/Model/Carrier/AbstractCarrierOnline.php b/app/code/Magento/Shipping/Model/Carrier/AbstractCarrierOnline.php
index 27047ae46bf1f..52c40083ba0db 100644
--- a/app/code/Magento/Shipping/Model/Carrier/AbstractCarrierOnline.php
+++ b/app/code/Magento/Shipping/Model/Carrier/AbstractCarrierOnline.php
@@ -29,6 +29,12 @@ abstract class AbstractCarrierOnline extends AbstractCarrier
 
     const GUAM_REGION_CODE = 'GU';
 
+    const CANARY_ISLANDS_COUNTRY_ID = 'IC';
+
+    const SANTA_CRUZ_DE_TENERIFE_REGION_ID = 'Santa Cruz de Tenerife';
+
+    const LAS_PALMAS_REGION_ID = 'Las Palmas';
+
     /**
      * Array of quotes
      *
diff --git a/app/code/Magento/Ups/Model/Carrier.php b/app/code/Magento/Ups/Model/Carrier.php
index 06f68db05398f..f5990ed098c8f 100644
--- a/app/code/Magento/Ups/Model/Carrier.php
+++ b/app/code/Magento/Ups/Model/Carrier.php
@@ -332,6 +332,14 @@ public function setRequest(RateRequest $request)
             $destCountry = self::GUAM_COUNTRY_ID;
         }
 
+        // For UPS, Las Palmas and Santa Cruz de Tenerife will be represented by Canary Islands country
+        if (
+            $destCountry == self::SPAIN_COUNTRY_ID &&
+            ($request->getDestRegionCode() == self::LAS_PALMAS_REGION_ID || $request->getDestRegionCode() == self::SANTA_CRUZ_DE_TENERIFE_REGION_ID)
+        ) {
+            $destCountry = self::CANARY_ISLANDS_COUNTRY_ID;
+        }
+
         $country = $this->_countryFactory->create()->load($destCountry);
         $rowRequest->setDestCountry($country->getData('iso2_code') ?: $destCountry);
 

From a958f5b3f333917766bc7d31c63480945a605f2c Mon Sep 17 00:00:00 2001
From: Milind Singh <milind7@live.com>
Date: Sat, 12 Jan 2019 13:55:54 +0530
Subject: [PATCH 40/70] Magento widgets source models forced to use deprecated
 interface #20064

---
 lib/internal/Magento/Framework/Option/ArrayPool.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/internal/Magento/Framework/Option/ArrayPool.php b/lib/internal/Magento/Framework/Option/ArrayPool.php
index 5ac349d99b82e..c417909cc9ddf 100644
--- a/lib/internal/Magento/Framework/Option/ArrayPool.php
+++ b/lib/internal/Magento/Framework/Option/ArrayPool.php
@@ -28,13 +28,13 @@ public function __construct(\Magento\Framework\ObjectManagerInterface $objectMan
      *
      * @param string $model
      * @throws \InvalidArgumentException
-     * @return \Magento\Framework\Option\ArrayInterface
+     * @return \Magento\Framework\Data\OptionSourceInterface
      */
     public function get($model)
     {
         $modelInstance = $this->_objectManager->get($model);
-        if (false == $modelInstance instanceof \Magento\Framework\Option\ArrayInterface) {
-            throw new \InvalidArgumentException($model . 'doesn\'t implement \Magento\Framework\Option\ArrayInterface');
+        if (false == $modelInstance instanceof \Magento\Framework\Data\OptionSourceInterface) {
+            throw new \InvalidArgumentException($model . 'doesn\'t implement \Magento\Framework\Data\OptionSourceInterface');
         }
         return $modelInstance;
     }

From db1e816b8bef968491b6875e7886900bfe2007e8 Mon Sep 17 00:00:00 2001
From: Khodu Vaishnav <khodu.vaishnav@krishtechnolabs.com>
Date: Sat, 12 Jan 2019 15:35:03 +0530
Subject: [PATCH 41/70] wishlist-patch : remove the comment from wishlist
 product.

---
 app/code/Magento/Wishlist/Controller/Index/Update.php | 2 --
 1 file changed, 2 deletions(-)

diff --git a/app/code/Magento/Wishlist/Controller/Index/Update.php b/app/code/Magento/Wishlist/Controller/Index/Update.php
index 056d58b4c70be..332edbedc6ef4 100755
--- a/app/code/Magento/Wishlist/Controller/Index/Update.php
+++ b/app/code/Magento/Wishlist/Controller/Index/Update.php
@@ -83,8 +83,6 @@ public function execute()
                 )->defaultCommentString()
                 ) {
                     $description = '';
-                } elseif (!strlen($description)) {
-                    $description = $item->getDescription();
                 }
 
                 $qty = null;

From eab547224baf316903b5a469463969625af93340 Mon Sep 17 00:00:00 2001
From: Tristan Hofman <hofmantristan@gmail.com>
Date: Sat, 12 Jan 2019 11:59:02 +0100
Subject: [PATCH 42/70] added missing spain_country_id constant

---
 .../Magento/Shipping/Model/Carrier/AbstractCarrierOnline.php    | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/code/Magento/Shipping/Model/Carrier/AbstractCarrierOnline.php b/app/code/Magento/Shipping/Model/Carrier/AbstractCarrierOnline.php
index 52c40083ba0db..0dadb0e243864 100644
--- a/app/code/Magento/Shipping/Model/Carrier/AbstractCarrierOnline.php
+++ b/app/code/Magento/Shipping/Model/Carrier/AbstractCarrierOnline.php
@@ -29,6 +29,8 @@ abstract class AbstractCarrierOnline extends AbstractCarrier
 
     const GUAM_REGION_CODE = 'GU';
 
+    const SPAIN_COUNTRY_ID = 'ES';
+
     const CANARY_ISLANDS_COUNTRY_ID = 'IC';
 
     const SANTA_CRUZ_DE_TENERIFE_REGION_ID = 'Santa Cruz de Tenerife';

From 476206ce2deb11f8c84566c170c7c7ebfe789cf5 Mon Sep 17 00:00:00 2001
From: Amrit Man Shrestha <1658188+amritms@users.noreply.github.com>
Date: Sun, 13 Jan 2019 22:05:12 +0545
Subject: [PATCH 43/70] Update README.md

---
 phpserver/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/phpserver/README.md b/phpserver/README.md
index 563d2ed7c9fc9..484c3c8fdb8cb 100644
--- a/phpserver/README.md
+++ b/phpserver/README.md
@@ -31,7 +31,7 @@ For more informations about the installation process using the CLI, you can cons
 
 ### How to run Magento
 
-Example usage: ```php -S 127.0.0.1:8082 -t ./pub/ ./phpserver/router.php```
+Example usage: ```php -S 127.0.0.1:8082 -t ./pub/  ./phpserver/router.php```
 
 ### What exactly the script does
 

From 233391b7e423a93b3711b45bc99eb12d30500db7 Mon Sep 17 00:00:00 2001
From: Amrit Man Shrestha <1658188+amritms@users.noreply.github.com>
Date: Sun, 13 Jan 2019 22:50:44 +0545
Subject: [PATCH 44/70] Update README.md

---
 phpserver/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/phpserver/README.md b/phpserver/README.md
index 484c3c8fdb8cb..563d2ed7c9fc9 100644
--- a/phpserver/README.md
+++ b/phpserver/README.md
@@ -31,7 +31,7 @@ For more informations about the installation process using the CLI, you can cons
 
 ### How to run Magento
 
-Example usage: ```php -S 127.0.0.1:8082 -t ./pub/  ./phpserver/router.php```
+Example usage: ```php -S 127.0.0.1:8082 -t ./pub/ ./phpserver/router.php```
 
 ### What exactly the script does
 

From 8bc0309bf756c59333dbbe75d24cd612b1353507 Mon Sep 17 00:00:00 2001
From: Arvinda kumar <arvindakumar@cedcoss.com>
Date: Mon, 14 Jan 2019 12:17:05 +0530
Subject: [PATCH 45/70] issue fixed #20259 Store switcher not sliding up and
 down, only dropdown arrow working

issue fixed #20259 Store switcher not sliding up and down, only dropdown arrow working
---
 .../Magento/blank/web/css/source/_navigation.less        | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/app/design/frontend/Magento/blank/web/css/source/_navigation.less b/app/design/frontend/Magento/blank/web/css/source/_navigation.less
index 4499886ef0f10..88d597ec0d0e7 100644
--- a/app/design/frontend/Magento/blank/web/css/source/_navigation.less
+++ b/app/design/frontend/Magento/blank/web/css/source/_navigation.less
@@ -135,8 +135,15 @@
         .switcher-dropdown {
             .lib-list-reset-styles();
             padding: @indent__s 0;
+            display: none;
         }
-
+        .switcher-options{
+            &.active{
+                .switcher-dropdown{
+                    display: block;
+                }
+            }
+        } 
         .header.links {
             .lib-list-reset-styles();
             border-bottom: 1px solid @color-gray82;

From 6d058a360315217b372e5b2da19ca1c45721df4f Mon Sep 17 00:00:00 2001
From: Devagouda Patil <depatil@ip-192-168-0-5.ec2.internal>
Date: Mon, 14 Jan 2019 12:31:51 -0600
Subject: [PATCH 46/70] MC-5593: [Modularity] Braintree module MFTF contain
 wide used sections and action groups - updated element location to use

---
 .../Tax/Test/Mftf/ActionGroup/AdminTaxActionGroup.xml     | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/code/Magento/Tax/Test/Mftf/ActionGroup/AdminTaxActionGroup.xml b/app/code/Magento/Tax/Test/Mftf/ActionGroup/AdminTaxActionGroup.xml
index 596b72070bf7e..3986ede9acf63 100644
--- a/app/code/Magento/Tax/Test/Mftf/ActionGroup/AdminTaxActionGroup.xml
+++ b/app/code/Magento/Tax/Test/Mftf/ActionGroup/AdminTaxActionGroup.xml
@@ -128,12 +128,12 @@
         <!--Select Configuration menu from Store-->
         <click selector="{{AdminMenuSection.stores}}" stepKey="clickOnSTORES" />
         <waitForPageLoad stepKey="waitForConfiguration"/>
-        <click selector="{{StoresSubmenuSection.configuration}}" stepKey="clickOnConfigurations"/>
+        <click selector="{{AdminMenuSection.configuration}}" stepKey="clickOnConfigurations"/>
         <waitForPageLoad stepKey="waitForSales"/>
         <!--Double click the same to fix flaky issue with redirection to Dashboard-->
         <click selector="{{AdminMenuSection.stores}}" stepKey="clickOnSTORES1" />
         <waitForPageLoad stepKey="waitForConfiguration1"/>
-        <click selector="{{StoresSubmenuSection.configuration}}" stepKey="clickOnConfigurations1"/>
+        <click selector="{{AdminMenuSection.configuration}}" stepKey="clickOnConfigurations1"/>
         <waitForPageLoad stepKey="waitForSales1" time="5"/>
         <!--Change default tax class for Shipping on Taxable Goods-->
         <click selector="{{ConfigurationListSection.sales}}" stepKey="clickOnSales" />
@@ -156,12 +156,12 @@
         <!--Select Configuration menu from Store-->
         <click selector="{{AdminMenuSection.stores}}" stepKey="clickOnSTORES" />
         <waitForPageLoad stepKey="waitForConfiguration"/>
-        <click selector="{{StoresSubmenuSection.configuration}}" stepKey="clickOnConfigurations"/>
+        <click selector="{{AdminMenuSection.configuration}}" stepKey="clickOnConfigurations"/>
         <waitForPageLoad stepKey="waitForSales"/>
         <!--Double click the same to fix flaky issue with redirection to Dashboard-->
         <click selector="{{AdminMenuSection.stores}}" stepKey="clickOnSTORES1" />
         <waitForPageLoad stepKey="waitForConfiguration1"/>
-        <click selector="{{StoresSubmenuSection.configuration}}" stepKey="clickOnConfigurations1"/>
+        <click selector="{{AdminMenuSection.configuration}}" stepKey="clickOnConfigurations1"/>
         <waitForPageLoad stepKey="waitForSales1"/>
         <!--Change default tax class for Shipping on Taxable Goods-->
         <click selector="{{ConfigurationListSection.sales}}" stepKey="clickOnSales" />

From 905368ce2b036211d209ed18da5898aafbdd1667 Mon Sep 17 00:00:00 2001
From: Arvinda kumar <arvindakumar@cedcoss.com>
Date: Mon, 14 Jan 2019 13:03:16 -0800
Subject: [PATCH 47/70] _navigation.less updated

_navigation.less updated
---
 .../frontend/Magento/blank/web/css/source/_navigation.less | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/app/design/frontend/Magento/blank/web/css/source/_navigation.less b/app/design/frontend/Magento/blank/web/css/source/_navigation.less
index 88d597ec0d0e7..10c7e3ed7eeea 100644
--- a/app/design/frontend/Magento/blank/web/css/source/_navigation.less
+++ b/app/design/frontend/Magento/blank/web/css/source/_navigation.less
@@ -131,15 +131,14 @@
                 );
             }
         }
-
         .switcher-dropdown {
             .lib-list-reset-styles();
             padding: @indent__s 0;
             display: none;
         }
-        .switcher-options{
-            &.active{
-                .switcher-dropdown{
+        .switcher-options {
+            &.active {
+                .switcher-dropdown {
                     display: block;
                 }
             }

From df3f8b06ebf3e410f5ecd38abfdc443377671ab1 Mon Sep 17 00:00:00 2001
From: Oleksandr Miroshnichenko <omiroshnichenko@magento.com>
Date: Mon, 14 Jan 2019 15:34:55 -0600
Subject: [PATCH 48/70] MC-10811:
 Magento\SalesRule\Test\TestCase\ApplySeveralSalesRuleEntityTest::testApplySeveralSalesRules
 with data set "ApplySeveralSalesRuleEntityTestVariation3" works wrong

---
 .../tests/app/Magento/SalesRule/Test/Repository/SalesRule.xml   | 2 +-
 .../SalesRule/Test/TestCase/ApplySeveralSalesRuleEntityTest.xml | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/dev/tests/functional/tests/app/Magento/SalesRule/Test/Repository/SalesRule.xml b/dev/tests/functional/tests/app/Magento/SalesRule/Test/Repository/SalesRule.xml
index 521d7d68ac4a6..5cb5b4db72769 100644
--- a/dev/tests/functional/tests/app/Magento/SalesRule/Test/Repository/SalesRule.xml
+++ b/dev/tests/functional/tests/app/Magento/SalesRule/Test/Repository/SalesRule.xml
@@ -271,7 +271,7 @@
             <field name="coupon_type" xsi:type="string">No Coupon</field>
             <field name="sort_order" xsi:type="string">1</field>
             <field name="is_rss" xsi:type="string">Yes</field>
-            <field name="conditions_serialized" xsi:type="string">[Total Items Quantity|equals or greater than|3]{Product attribute combination|FOUND|ALL|:[[Category|is|2]]}</field>
+            <field name="conditions_serialized" xsi:type="string">[Total Items Quantity|equals or greater than|3]</field>
             <field name="simple_action" xsi:type="string">Percent of product price discount</field>
             <field name="discount_amount" xsi:type="string">25</field>
             <field name="apply_to_shipping" xsi:type="string">No</field>
diff --git a/dev/tests/functional/tests/app/Magento/SalesRule/Test/TestCase/ApplySeveralSalesRuleEntityTest.xml b/dev/tests/functional/tests/app/Magento/SalesRule/Test/TestCase/ApplySeveralSalesRuleEntityTest.xml
index e160fef609545..3dfe4cf118552 100644
--- a/dev/tests/functional/tests/app/Magento/SalesRule/Test/TestCase/ApplySeveralSalesRuleEntityTest.xml
+++ b/dev/tests/functional/tests/app/Magento/SalesRule/Test/TestCase/ApplySeveralSalesRuleEntityTest.xml
@@ -31,7 +31,6 @@
             <constraint name="Magento\SalesRule\Test\Constraint\AssertCartPriceRuleConditionIsApplied" />
         </variation>
         <variation name="ApplySeveralSalesRuleEntityTestVariation3" summary="Rules with different priority, both are applied">
-            <data name="tag" xsi:type="string">stable:no</data>
             <data name="salesRules/rule1" xsi:type="string">active_sales_rule_product_attribute</data>
             <data name="salesRules/rule2" xsi:type="string">active_sales_total_items</data>
             <data name="cartPrice/sub_total" xsi:type="string">250.00</data>
@@ -44,7 +43,6 @@
             <constraint name="Magento\SalesRule\Test\Constraint\AssertCartPriceRuleConditionIsApplied" />
         </variation>
         <variation name="ApplySeveralSalesRuleEntityTestVariation4" summary="Rules with different priority, none are applied">
-            <data name="tag" xsi:type="string">to_maintain:yes</data>
             <data name="salesRules/rule1" xsi:type="string">active_sales_rule_row_total</data>
             <data name="salesRules/rule2" xsi:type="string">active_sales_total_items</data>
             <data name="productForSalesRule1/dataset" xsi:type="string">simple_for_salesrule_1</data>

From 0652e87b1941d868c8d2469ba12e07fd35d6d130 Mon Sep 17 00:00:00 2001
From: Arvinda kumar <arvindakumar@cedcoss.com>
Date: Tue, 15 Jan 2019 16:46:44 +0530
Subject: [PATCH 49/70] issue fixed #20299 Order item details label not aligned
 in mobile view

issue fixed #20299 Order item details label not aligned in mobile view
---
 .../Magento_Checkout/web/css/source/module/_cart.less | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/app/design/frontend/Magento/luma/Magento_Checkout/web/css/source/module/_cart.less b/app/design/frontend/Magento/luma/Magento_Checkout/web/css/source/module/_cart.less
index 58582d344e75a..e3bc5a478b025 100644
--- a/app/design/frontend/Magento/luma/Magento_Checkout/web/css/source/module/_cart.less
+++ b/app/design/frontend/Magento/luma/Magento_Checkout/web/css/source/module/_cart.less
@@ -497,6 +497,17 @@
             }
         }
     }
+    
+    .cart.table-wrapper,
+    .order-items.table-wrapper {
+        .col.price,
+        .col.qty,
+        .col.subtotal,
+        .col.msrp {
+            text-align: left;
+        }
+    }
+    
 }
 
 //

From 3a669e8a9151f63a4910fa090f002e736137a08c Mon Sep 17 00:00:00 2001
From: Pratik Oza <magepratik@gmail.com>
Date: Tue, 15 Jan 2019 22:02:52 +0530
Subject: [PATCH 50/70] Fixed a couple of spelling mistakes

---
 .../Magento/Customer/Model/CustomerMetadataTest.php       | 8 ++++----
 lib/internal/LinLibertineFont/ChangeLog.txt               | 2 +-
 .../Magento/Framework/DB/Adapter/AdapterInterface.php     | 2 +-
 .../src/Magento/Setup/Console/Command/InstallCommand.php  | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/dev/tests/integration/testsuite/Magento/Customer/Model/CustomerMetadataTest.php b/dev/tests/integration/testsuite/Magento/Customer/Model/CustomerMetadataTest.php
index 794fce17480fa..a5c69bcd3239e 100644
--- a/dev/tests/integration/testsuite/Magento/Customer/Model/CustomerMetadataTest.php
+++ b/dev/tests/integration/testsuite/Magento/Customer/Model/CustomerMetadataTest.php
@@ -239,10 +239,10 @@ public function testGetCustomerAttributeMetadata()
         $this->assertNotEmpty($attributes);
 
         // remove odd extension attributes
-        $allAtrributes = $expectAttrsWithVals;
-        $allAtrributes['created_at'] = $attributes['created_at'];
-        $allAtrributes['updated_at'] = $attributes['updated_at'];
-        $attributes = array_intersect_key($attributes, $allAtrributes);
+        $allAttributes = $expectAttrsWithVals;
+        $allAttributes['created_at'] = $attributes['created_at'];
+        $allAttributes['updated_at'] = $attributes['updated_at'];
+        $attributes = array_intersect_key($attributes, $allAttributes);
 
         foreach ($attributes as $attributeCode => $attributeValue) {
             $this->assertNotNull($attributeCode);
diff --git a/lib/internal/LinLibertineFont/ChangeLog.txt b/lib/internal/LinLibertineFont/ChangeLog.txt
index 8dc2c56567a4b..83b8792e71eda 100644
--- a/lib/internal/LinLibertineFont/ChangeLog.txt
+++ b/lib/internal/LinLibertineFont/ChangeLog.txt
@@ -952,7 +952,7 @@ Changes to version 0.5.8 regular(|) & italic(/) (20040315)
 Changes to version 0.5.7 regular(|) & italic(/) (20040315)
 -N is now 66pt wider
 -^ {Ascicircum} is now better
-- {exclamdown} is now availible
+- {exclamdown} is now available
 - {currency} has been added
 | "-" hyphen is the same as softhyphen. length is now 510pt
 -bars have been made
diff --git a/lib/internal/Magento/Framework/DB/Adapter/AdapterInterface.php b/lib/internal/Magento/Framework/DB/Adapter/AdapterInterface.php
index 5c9bc9c2fb2d7..48d488a322cb0 100644
--- a/lib/internal/Magento/Framework/DB/Adapter/AdapterInterface.php
+++ b/lib/internal/Magento/Framework/DB/Adapter/AdapterInterface.php
@@ -633,7 +633,7 @@ public function quoteInto($text, $value, $type = null, $count = null);
     /**
      * Quotes an identifier.
      *
-     * Accepts a string representing a qualified indentifier. For Example:
+     * Accepts a string representing a qualified identifier. For Example:
      * <code>
      * $adapter->quoteIdentifier('myschema.mytable')
      * </code>
diff --git a/setup/src/Magento/Setup/Console/Command/InstallCommand.php b/setup/src/Magento/Setup/Console/Command/InstallCommand.php
index 74c2e3b24234c..cc1cca74ed6df 100644
--- a/setup/src/Magento/Setup/Console/Command/InstallCommand.php
+++ b/setup/src/Magento/Setup/Console/Command/InstallCommand.php
@@ -183,7 +183,7 @@ protected function configure()
                 self::INPUT_KEY_INTERACTIVE_SETUP,
                 self::INPUT_KEY_INTERACTIVE_SETUP_SHORTCUT,
                 InputOption::VALUE_NONE,
-                'Interactive Magento instalation'
+                'Interactive Magento installation'
             ),
             new InputOption(
                 OperationsExecutor::KEY_SAFE_MODE,

From e669fae69406f50e98757b8736717188225e3aeb Mon Sep 17 00:00:00 2001
From: Pratik Oza <magepratik@gmail.com>
Date: Tue, 15 Jan 2019 22:02:52 +0530
Subject: [PATCH 51/70] Fixed a couple of spelling mistakes

---
 .../Magento/Customer/Model/CustomerMetadataTest.php       | 8 ++++----
 .../Magento/Framework/DB/Adapter/AdapterInterface.php     | 2 +-
 .../src/Magento/Setup/Console/Command/InstallCommand.php  | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/dev/tests/integration/testsuite/Magento/Customer/Model/CustomerMetadataTest.php b/dev/tests/integration/testsuite/Magento/Customer/Model/CustomerMetadataTest.php
index 794fce17480fa..a5c69bcd3239e 100644
--- a/dev/tests/integration/testsuite/Magento/Customer/Model/CustomerMetadataTest.php
+++ b/dev/tests/integration/testsuite/Magento/Customer/Model/CustomerMetadataTest.php
@@ -239,10 +239,10 @@ public function testGetCustomerAttributeMetadata()
         $this->assertNotEmpty($attributes);
 
         // remove odd extension attributes
-        $allAtrributes = $expectAttrsWithVals;
-        $allAtrributes['created_at'] = $attributes['created_at'];
-        $allAtrributes['updated_at'] = $attributes['updated_at'];
-        $attributes = array_intersect_key($attributes, $allAtrributes);
+        $allAttributes = $expectAttrsWithVals;
+        $allAttributes['created_at'] = $attributes['created_at'];
+        $allAttributes['updated_at'] = $attributes['updated_at'];
+        $attributes = array_intersect_key($attributes, $allAttributes);
 
         foreach ($attributes as $attributeCode => $attributeValue) {
             $this->assertNotNull($attributeCode);
diff --git a/lib/internal/Magento/Framework/DB/Adapter/AdapterInterface.php b/lib/internal/Magento/Framework/DB/Adapter/AdapterInterface.php
index 5c9bc9c2fb2d7..48d488a322cb0 100644
--- a/lib/internal/Magento/Framework/DB/Adapter/AdapterInterface.php
+++ b/lib/internal/Magento/Framework/DB/Adapter/AdapterInterface.php
@@ -633,7 +633,7 @@ public function quoteInto($text, $value, $type = null, $count = null);
     /**
      * Quotes an identifier.
      *
-     * Accepts a string representing a qualified indentifier. For Example:
+     * Accepts a string representing a qualified identifier. For Example:
      * <code>
      * $adapter->quoteIdentifier('myschema.mytable')
      * </code>
diff --git a/setup/src/Magento/Setup/Console/Command/InstallCommand.php b/setup/src/Magento/Setup/Console/Command/InstallCommand.php
index 74c2e3b24234c..cc1cca74ed6df 100644
--- a/setup/src/Magento/Setup/Console/Command/InstallCommand.php
+++ b/setup/src/Magento/Setup/Console/Command/InstallCommand.php
@@ -183,7 +183,7 @@ protected function configure()
                 self::INPUT_KEY_INTERACTIVE_SETUP,
                 self::INPUT_KEY_INTERACTIVE_SETUP_SHORTCUT,
                 InputOption::VALUE_NONE,
-                'Interactive Magento instalation'
+                'Interactive Magento installation'
             ),
             new InputOption(
                 OperationsExecutor::KEY_SAFE_MODE,

From b1e21dbabe207997ce877390bb5e58456f5a4d66 Mon Sep 17 00:00:00 2001
From: nmalevanec <mikola.malevanec@transoftgroup.com>
Date: Wed, 16 Jan 2019 11:52:32 +0200
Subject: [PATCH 52/70] Fix static tests.

---
 .../luma/Magento_Checkout/web/css/source/module/_cart.less    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/design/frontend/Magento/luma/Magento_Checkout/web/css/source/module/_cart.less b/app/design/frontend/Magento/luma/Magento_Checkout/web/css/source/module/_cart.less
index e3bc5a478b025..9c7b020cb4b8b 100644
--- a/app/design/frontend/Magento/luma/Magento_Checkout/web/css/source/module/_cart.less
+++ b/app/design/frontend/Magento/luma/Magento_Checkout/web/css/source/module/_cart.less
@@ -497,7 +497,7 @@
             }
         }
     }
-    
+
     .cart.table-wrapper,
     .order-items.table-wrapper {
         .col.price,
@@ -507,7 +507,7 @@
             text-align: left;
         }
     }
-    
+
 }
 
 //

From 66284ba513c3324fbdd66bf3d2084ce9c1a93632 Mon Sep 17 00:00:00 2001
From: Ronak Patel <ronak2ram@gmail.com>
Date: Wed, 16 Jan 2019 15:40:31 +0530
Subject: [PATCH 53/70] Correct spell in js files

---
 app/code/Magento/Ui/view/base/web/js/grid/editing/client.js | 4 ++--
 app/code/Magento/Ui/view/base/web/js/grid/editing/editor.js | 4 ++--
 app/code/Magento/Ui/view/base/web/js/grid/editing/record.js | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/code/Magento/Ui/view/base/web/js/grid/editing/client.js b/app/code/Magento/Ui/view/base/web/js/grid/editing/client.js
index f68a6f97d964f..ca82ff81d3b6f 100644
--- a/app/code/Magento/Ui/view/base/web/js/grid/editing/client.js
+++ b/app/code/Magento/Ui/view/base/web/js/grid/editing/client.js
@@ -54,7 +54,7 @@ define([
 
         /**
          * Proxy save method which might invoke
-         * data valiation prior to its' saving.
+         * data validation prior to its' saving.
          *
          * @param {Object} data - Data to be processed.
          * @returns {jQueryPromise}
@@ -128,7 +128,7 @@ define([
         /**
          * Handles ajax success callback.
          *
-         * @param {jQueryPromise} promise - Promise to be resoloved.
+         * @param {jQueryPromise} promise - Promise to be resolved.
          * @param {*} data - See 'jquery' ajax success callback.
          */
         onSuccess: function (promise, data) {
diff --git a/app/code/Magento/Ui/view/base/web/js/grid/editing/editor.js b/app/code/Magento/Ui/view/base/web/js/grid/editing/editor.js
index a4785aea03743..ece49cc8fe27c 100644
--- a/app/code/Magento/Ui/view/base/web/js/grid/editing/editor.js
+++ b/app/code/Magento/Ui/view/base/web/js/grid/editing/editor.js
@@ -357,7 +357,7 @@ define([
 
         /**
          * Resets specific records' data
-         * to the data present in asscotiated row.
+         * to the data present in associated row.
          *
          * @param {(Number|String)} id - See 'getId' method.
          * @param {Boolean} [isIndex=false] - See 'getId' method.
@@ -403,7 +403,7 @@ define([
         /**
          * Disables editing of specified fields.
          *
-         * @param {Array} fields - An array of fields indeces to be disabled.
+         * @param {Array} fields - An array of fields indexes to be disabled.
          * @returns {Editor} Chainable.
          */
         disableFields: function (fields) {
diff --git a/app/code/Magento/Ui/view/base/web/js/grid/editing/record.js b/app/code/Magento/Ui/view/base/web/js/grid/editing/record.js
index c648875e62d7c..9b8998368c5ff 100644
--- a/app/code/Magento/Ui/view/base/web/js/grid/editing/record.js
+++ b/app/code/Magento/Ui/view/base/web/js/grid/editing/record.js
@@ -264,7 +264,7 @@ define([
         /**
          * Validates all of the available fields.
          *
-         * @returns {Array} An array with validatation results.
+         * @returns {Array} An array with validation results.
          */
         validate: function () {
             return this.elems.map('validate');
@@ -306,7 +306,7 @@ define([
         },
 
         /**
-         * Updates 'fields' array filling it with available edtiors
+         * Updates 'fields' array filling it with available editors
          * or with column instances if associated field is not present.
          *
          * @returns {Record} Chainable.

From f1b194b7ca3c8e2ff8de59d471e090b0d9dc1971 Mon Sep 17 00:00:00 2001
From: "v.sikailo" <v.sikailo@ism-ukraine.com>
Date: Wed, 16 Jan 2019 13:24:02 +0200
Subject: [PATCH 54/70] deleted unused code

---
 .../Block/Adminhtml/Product/Frontend/Product/Watermark.php       | 1 -
 app/code/Magento/Catalog/Model/Product/Option/Type/Date.php      | 1 -
 2 files changed, 2 deletions(-)

diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Frontend/Product/Watermark.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Frontend/Product/Watermark.php
index 1f74969c3d169..c4cd35cdf29c5 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Frontend/Product/Watermark.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Frontend/Product/Watermark.php
@@ -130,7 +130,6 @@ public function render(AbstractElement $element)
      */
     protected function _getHeaderHtml($element)
     {
-        $id = $element->getHtmlId();
         $default = !$this->getRequest()->getParam('website') && !$this->getRequest()->getParam('store');
 
         $html = '<h4 class="icon-head head-edit-form">' . $element->getLegend() . '</h4>';
diff --git a/app/code/Magento/Catalog/Model/Product/Option/Type/Date.php b/app/code/Magento/Catalog/Model/Product/Option/Type/Date.php
index b19906ecd6cc9..33c37238e5bdf 100644
--- a/app/code/Magento/Catalog/Model/Product/Option/Type/Date.php
+++ b/app/code/Magento/Catalog/Model/Product/Option/Type/Date.php
@@ -147,7 +147,6 @@ public function validateUserValue($values)
     public function prepareForCart()
     {
         if ($this->getIsValid() && $this->getUserValue() !== null) {
-            $option = $this->getOption();
             $value = $this->getUserValue();
 
             if (isset($value['date_internal']) && $value['date_internal'] != '') {

From b7bc23f8175572962fbb337708fa5c66edcc17bd Mon Sep 17 00:00:00 2001
From: "v.sikailo" <v.sikailo@ism-ukraine.com>
Date: Wed, 16 Jan 2019 13:44:00 +0200
Subject: [PATCH 55/70] PHPDocs fixes

---
 .../Magento/Catalog/Api/CategoryLinkRepositoryInterface.php | 2 +-
 .../Catalog/Api/Data/ProductRender/PriceInfoInterface.php   | 2 +-
 .../Magento/Catalog/Api/Data/ProductRenderInterface.php     | 4 ++--
 .../Magento/Catalog/Controller/Adminhtml/Category/Move.php  | 2 +-
 app/code/Magento/Catalog/Controller/Index/Index.php         | 2 +-
 app/code/Magento/Catalog/Helper/Product/Configuration.php   | 1 +
 app/code/Magento/Catalog/Helper/Product/ProductList.php     | 1 +
 app/code/Magento/Catalog/Helper/Product/View.php            | 2 +-
 .../Catalog/Model/Indexer/Product/Category/Action/Rows.php  | 1 +
 .../Catalog/Model/Indexer/Product/Flat/Action/Indexer.php   | 2 +-
 app/code/Magento/Catalog/Model/Layer/Filter/Decimal.php     | 2 +-
 .../Magento/Catalog/Model/Layer/Filter/Item/DataBuilder.php | 2 +-
 .../Model/Plugin/ProductRepository/TransactionWrapper.php   | 6 +++---
 .../Magento/Catalog/Model/Product/Website/ReadHandler.php   | 2 +-
 app/code/Magento/Catalog/Model/ProductIdLocator.php         | 2 +-
 app/code/Magento/Catalog/Model/ProductRender.php            | 2 +-
 app/code/Magento/Catalog/Model/ProductRender/Image.php      | 4 ++--
 app/code/Magento/Catalog/Model/ProductRenderList.php        | 1 -
 .../Catalog/Model/ResourceModel/AbstractCollection.php      | 2 +-
 app/code/Magento/Catalog/Model/ResourceModel/Category.php   | 2 +-
 .../Model/ResourceModel/Product/Indexer/Eav/AbstractEav.php | 1 -
 .../Product/Indexer/Price/Query/BaseFinalPrice.php          | 2 ++
 .../Product/Indexer/TemporaryTableStrategy.php              | 2 +-
 .../Model/ResourceModel/Product/Link/DeleteHandler.php      | 2 +-
 app/code/Magento/Catalog/Model/Rss/Category.php             | 2 +-
 app/code/Magento/Catalog/Model/Template/Filter.php          | 4 ++--
 .../Magento/Catalog/Plugin/Model/ResourceModel/Config.php   | 4 ++--
 .../Catalog/Ui/DataProvider/Product/Form/Modifier/Eav.php   | 2 +-
 .../Product/Form/Modifier/Eav/CompositeConfigProcessor.php  | 1 +
 .../Ui/DataProvider/Product/Listing/DataProvider.php        | 2 --
 .../Product/ProductRenderCollectorInterface.php             | 1 -
 31 files changed, 34 insertions(+), 33 deletions(-)

diff --git a/app/code/Magento/Catalog/Api/CategoryLinkRepositoryInterface.php b/app/code/Magento/Catalog/Api/CategoryLinkRepositoryInterface.php
index 30ac06107ba1d..78b0645bb29db 100644
--- a/app/code/Magento/Catalog/Api/CategoryLinkRepositoryInterface.php
+++ b/app/code/Magento/Catalog/Api/CategoryLinkRepositoryInterface.php
@@ -38,7 +38,7 @@ public function delete(\Magento\Catalog\Api\Data\CategoryProductLinkInterface $p
     /**
      * Remove the product assignment from the category by category id and sku
      *
-     * @param string $sku
+     * @param int $categoryId
      * @param string $sku
      * @return bool will returned True if products successfully deleted
      *
diff --git a/app/code/Magento/Catalog/Api/Data/ProductRender/PriceInfoInterface.php b/app/code/Magento/Catalog/Api/Data/ProductRender/PriceInfoInterface.php
index 2ef4d068317dd..d12f54c8cdc41 100644
--- a/app/code/Magento/Catalog/Api/Data/ProductRender/PriceInfoInterface.php
+++ b/app/code/Magento/Catalog/Api/Data/ProductRender/PriceInfoInterface.php
@@ -148,7 +148,7 @@ public function getFormattedPrices();
     /**
      * Set dto with formatted prices
      *
-     * @param string[] $formattedPriceInfo
+     * @param FormattedPriceInfoInterface $formattedPriceInfo
      * @return void
      * @since 101.1.0
      */
diff --git a/app/code/Magento/Catalog/Api/Data/ProductRenderInterface.php b/app/code/Magento/Catalog/Api/Data/ProductRenderInterface.php
index 910168d8854e7..dddf046596b50 100644
--- a/app/code/Magento/Catalog/Api/Data/ProductRenderInterface.php
+++ b/app/code/Magento/Catalog/Api/Data/ProductRenderInterface.php
@@ -30,7 +30,7 @@ public function getAddToCartButton();
     /**
      * Set information needed for render "Add To Cart" button on front
      *
-     * @param \Magento\Catalog\Api\Data\ProductRender\ButtonInterface $addToCartData
+     * @param ButtonInterface $cartAddToCartButton
      * @return void
      * @since 101.1.0
      */
@@ -47,7 +47,7 @@ public function getAddToCompareButton();
     /**
      * Set information needed for render "Add To Compare" button on front
      *
-     * @param ButtonInterface $compareUrlData
+     * @param ButtonInterface $compareButton
      * @return string
      * @since 101.1.0
      */
diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Category/Move.php b/app/code/Magento/Catalog/Controller/Adminhtml/Category/Move.php
index ba6bfddca9c6c..858850e45db7f 100644
--- a/app/code/Magento/Catalog/Controller/Adminhtml/Category/Move.php
+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Category/Move.php
@@ -46,7 +46,7 @@ public function __construct(
     /**
      * Move category action
      *
-     * @return \Magento\Framework\Controller\Result\Raw
+     * @return \Magento\Framework\Controller\Result\Json
      */
     public function execute()
     {
diff --git a/app/code/Magento/Catalog/Controller/Index/Index.php b/app/code/Magento/Catalog/Controller/Index/Index.php
index eae3325df9fc2..b89f495b9edb2 100644
--- a/app/code/Magento/Catalog/Controller/Index/Index.php
+++ b/app/code/Magento/Catalog/Controller/Index/Index.php
@@ -10,7 +10,7 @@ class Index extends \Magento\Framework\App\Action\Action
     /**
      * Index action
      *
-     * @return $this
+     * @return \Magento\Framework\Controller\Result\Redirect
      */
     public function execute()
     {
diff --git a/app/code/Magento/Catalog/Helper/Product/Configuration.php b/app/code/Magento/Catalog/Helper/Product/Configuration.php
index 9b47e29900992..5b8f6fad6e18a 100644
--- a/app/code/Magento/Catalog/Helper/Product/Configuration.php
+++ b/app/code/Magento/Catalog/Helper/Product/Configuration.php
@@ -55,6 +55,7 @@ class Configuration extends AbstractHelper implements ConfigurationInterface
      * @param \Magento\Framework\Filter\FilterManager $filter
      * @param \Magento\Framework\Stdlib\StringUtils $string
      * @param Json $serializer
+     * @param Escaper $escaper
      */
     public function __construct(
         \Magento\Framework\App\Helper\Context $context,
diff --git a/app/code/Magento/Catalog/Helper/Product/ProductList.php b/app/code/Magento/Catalog/Helper/Product/ProductList.php
index fbea73a6324de..3aa6aeed3779a 100644
--- a/app/code/Magento/Catalog/Helper/Product/ProductList.php
+++ b/app/code/Magento/Catalog/Helper/Product/ProductList.php
@@ -42,6 +42,7 @@ class ProductList
 
     /**
      * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
+     * @param \Magento\Framework\Registry $coreRegistry
      */
     public function __construct(
         \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
diff --git a/app/code/Magento/Catalog/Helper/Product/View.php b/app/code/Magento/Catalog/Helper/Product/View.php
index 1509e489aee3b..87e93e3f20e5b 100644
--- a/app/code/Magento/Catalog/Helper/Product/View.php
+++ b/app/code/Magento/Catalog/Helper/Product/View.php
@@ -105,7 +105,7 @@ public function __construct(
      *
      * @param \Magento\Framework\View\Result\Page $resultPage
      * @param \Magento\Catalog\Model\Product $product
-     * @return \Magento\Framework\View\Result\Page
+     * @return $this
      */
     private function preparePageMetadata(ResultPage $resultPage, $product)
     {
diff --git a/app/code/Magento/Catalog/Model/Indexer/Product/Category/Action/Rows.php b/app/code/Magento/Catalog/Model/Indexer/Product/Category/Action/Rows.php
index a218266c25034..eb58ed39b81b5 100644
--- a/app/code/Magento/Catalog/Model/Indexer/Product/Category/Action/Rows.php
+++ b/app/code/Magento/Catalog/Model/Indexer/Product/Category/Action/Rows.php
@@ -213,6 +213,7 @@ protected function isRangingNeeded()
     /**
      * Returns a list of category ids which are assigned to product ids in the index
      *
+     * @param array $productIds
      * @return \Magento\Framework\Indexer\CacheContext
      */
     private function getCategoryIdsFromIndex(array $productIds)
diff --git a/app/code/Magento/Catalog/Model/Indexer/Product/Flat/Action/Indexer.php b/app/code/Magento/Catalog/Model/Indexer/Product/Flat/Action/Indexer.php
index a669fb73f64fc..c14bc0dd7e507 100644
--- a/app/code/Magento/Catalog/Model/Indexer/Product/Flat/Action/Indexer.php
+++ b/app/code/Magento/Catalog/Model/Indexer/Product/Flat/Action/Indexer.php
@@ -54,7 +54,7 @@ public function __construct(
      * @param int $storeId
      * @param int $productId
      * @param string $valueFieldSuffix
-     * @return \Magento\Catalog\Model\Indexer\Product\Flat
+     * @return $this
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
      * @SuppressWarnings(PHPMD.NPathComplexity)
diff --git a/app/code/Magento/Catalog/Model/Layer/Filter/Decimal.php b/app/code/Magento/Catalog/Model/Layer/Filter/Decimal.php
index dac2632ff6db8..d76711cb21dbf 100644
--- a/app/code/Magento/Catalog/Model/Layer/Filter/Decimal.php
+++ b/app/code/Magento/Catalog/Model/Layer/Filter/Decimal.php
@@ -32,8 +32,8 @@ class Decimal extends \Magento\Catalog\Model\Layer\Filter\AbstractFilter
      * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Catalog\Model\Layer $layer
      * @param \Magento\Catalog\Model\Layer\Filter\Item\DataBuilder $itemDataBuilder
-     * @param \Magento\Catalog\Model\ResourceModel\Layer\Filter\DecimalFactory $filterDecimalFactory
      * @param \Magento\Framework\Pricing\PriceCurrencyInterface $priceCurrency
+     * @param \Magento\Catalog\Model\Layer\Filter\DataProvider\DecimalFactory $dataProviderFactory
      * @param array $data
      */
     public function __construct(
diff --git a/app/code/Magento/Catalog/Model/Layer/Filter/Item/DataBuilder.php b/app/code/Magento/Catalog/Model/Layer/Filter/Item/DataBuilder.php
index 4d2878b0b1e84..6fcce20eb3152 100644
--- a/app/code/Magento/Catalog/Model/Layer/Filter/Item/DataBuilder.php
+++ b/app/code/Magento/Catalog/Model/Layer/Filter/Item/DataBuilder.php
@@ -29,7 +29,7 @@ class DataBuilder
      * Add Item Data
      *
      * @param string $label
-     * @param string $label
+     * @param string $value
      * @param int $count
      * @return void
      */
diff --git a/app/code/Magento/Catalog/Model/Plugin/ProductRepository/TransactionWrapper.php b/app/code/Magento/Catalog/Model/Plugin/ProductRepository/TransactionWrapper.php
index c88215d92357e..0f442c6bbffc9 100644
--- a/app/code/Magento/Catalog/Model/Plugin/ProductRepository/TransactionWrapper.php
+++ b/app/code/Magento/Catalog/Model/Plugin/ProductRepository/TransactionWrapper.php
@@ -25,7 +25,7 @@ public function __construct(
 
     /**
      * @param \Magento\Catalog\Api\ProductRepositoryInterface $subject
-     * @param callable $proceed
+     * @param \Closure $proceed
      * @param \Magento\Catalog\Api\Data\ProductInterface $product
      * @param bool $saveOptions
      * @return \Magento\Catalog\Api\Data\ProductInterface
@@ -52,7 +52,7 @@ public function aroundSave(
 
     /**
      * @param \Magento\Catalog\Api\ProductRepositoryInterface $subject
-     * @param callable $proceed
+     * @param \Closure $proceed
      * @param \Magento\Catalog\Api\Data\ProductInterface $product
      * @return bool
      * @throws \Exception
@@ -77,7 +77,7 @@ public function aroundDelete(
 
     /**
      * @param \Magento\Catalog\Api\ProductRepositoryInterface $subject
-     * @param callable $proceed
+     * @param \Closure $proceed
      * @param string $productSku
      * @return bool
      * @throws \Exception
diff --git a/app/code/Magento/Catalog/Model/Product/Website/ReadHandler.php b/app/code/Magento/Catalog/Model/Product/Website/ReadHandler.php
index e81cdedd6d370..5ecabd8d43529 100644
--- a/app/code/Magento/Catalog/Model/Product/Website/ReadHandler.php
+++ b/app/code/Magento/Catalog/Model/Product/Website/ReadHandler.php
@@ -18,7 +18,7 @@ class ReadHandler implements ExtensionInterface
 
     /**
      * ReadHandler constructor.
-     * @param ProductWebsiteLink $resourceModel
+     * @param ProductWebsiteLink $productWebsiteLink
      */
     public function __construct(
         ProductWebsiteLink $productWebsiteLink
diff --git a/app/code/Magento/Catalog/Model/ProductIdLocator.php b/app/code/Magento/Catalog/Model/ProductIdLocator.php
index 2d9af6829ad6e..66a0ece89db6d 100644
--- a/app/code/Magento/Catalog/Model/ProductIdLocator.php
+++ b/app/code/Magento/Catalog/Model/ProductIdLocator.php
@@ -40,7 +40,7 @@ class ProductIdLocator implements \Magento\Catalog\Model\ProductIdLocatorInterfa
     /**
      * @param \Magento\Framework\EntityManager\MetadataPool $metadataPool
      * @param \Magento\Catalog\Model\ResourceModel\Product\CollectionFactory $collectionFactory
-     * @param string $limitIdsBySkuValues
+     * @param int $idsLimit
      */
     public function __construct(
         \Magento\Framework\EntityManager\MetadataPool $metadataPool,
diff --git a/app/code/Magento/Catalog/Model/ProductRender.php b/app/code/Magento/Catalog/Model/ProductRender.php
index 702c04b910d44..5efb0343cd99b 100644
--- a/app/code/Magento/Catalog/Model/ProductRender.php
+++ b/app/code/Magento/Catalog/Model/ProductRender.php
@@ -206,7 +206,7 @@ public function getExtensionAttributes()
      * Set an extension attributes object.
      *
      * @param \Magento\Catalog\Api\Data\ProductRenderExtensionInterface $extensionAttributes
-     * @return $this
+     * @return void
      */
     public function setExtensionAttributes(
         \Magento\Catalog\Api\Data\ProductRenderExtensionInterface $extensionAttributes
diff --git a/app/code/Magento/Catalog/Model/ProductRender/Image.php b/app/code/Magento/Catalog/Model/ProductRender/Image.php
index 774199a0dbf0a..09416d38773fc 100644
--- a/app/code/Magento/Catalog/Model/ProductRender/Image.php
+++ b/app/code/Magento/Catalog/Model/ProductRender/Image.php
@@ -16,7 +16,7 @@ class Image extends \Magento\Framework\Model\AbstractExtensibleModel implements
 {
     /**
      * @param string $url
-     * @return @return void
+     * @return void
      */
     public function setUrl($url)
     {
@@ -149,7 +149,7 @@ public function getExtensionAttributes()
      * Set an extension attributes object.
      *
      * @param \Magento\Catalog\Api\Data\ProductRender\ImageExtensionInterface $extensionAttributes
-     * @return $this
+     * @return void
      */
     public function setExtensionAttributes(
         \Magento\Catalog\Api\Data\ProductRender\ImageExtensionInterface $extensionAttributes
diff --git a/app/code/Magento/Catalog/Model/ProductRenderList.php b/app/code/Magento/Catalog/Model/ProductRenderList.php
index a3d906cf10c15..230fe66681e82 100644
--- a/app/code/Magento/Catalog/Model/ProductRenderList.php
+++ b/app/code/Magento/Catalog/Model/ProductRenderList.php
@@ -64,7 +64,6 @@ class ProductRenderList implements ProductRenderListInterface
      * @param ProductRenderSearchResultsFactory $searchResultFactory
      * @param ProductRenderFactory $productRenderDtoFactory
      * @param Config $config
-     * @param Product\Visibility $productVisibility
      * @param CollectionModifier $collectionModifier
      * @param array $productAttributes
      */
diff --git a/app/code/Magento/Catalog/Model/ResourceModel/AbstractCollection.php b/app/code/Magento/Catalog/Model/ResourceModel/AbstractCollection.php
index d4f5fdd5137c1..07acd5ceb5f29 100644
--- a/app/code/Magento/Catalog/Model/ResourceModel/AbstractCollection.php
+++ b/app/code/Magento/Catalog/Model/ResourceModel/AbstractCollection.php
@@ -128,7 +128,7 @@ public function setPage($pageNum, $pageSize)
      *
      * @param int $limit
      * @param int $offset
-     * @return \Magento\Eav\Model\Entity\Collection\AbstractCollection
+     * @return \Magento\Framework\DB\Select
      */
     protected function _getAllIdsSelect($limit = null, $offset = null)
     {
diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Category.php b/app/code/Magento/Catalog/Model/ResourceModel/Category.php
index 5b420c33b3184..dd9c97fae43c9 100644
--- a/app/code/Magento/Catalog/Model/ResourceModel/Category.php
+++ b/app/code/Magento/Catalog/Model/ResourceModel/Category.php
@@ -200,7 +200,7 @@ protected function _getTree()
      * delete child categories
      *
      * @param \Magento\Framework\DataObject $object
-     * @return $this
+     * @return void
      */
     protected function _beforeDelete(\Magento\Framework\DataObject $object)
     {
diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/Eav/AbstractEav.php b/app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/Eav/AbstractEav.php
index c33ea7c781aa3..a28e7c04421b5 100644
--- a/app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/Eav/AbstractEav.php
+++ b/app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/Eav/AbstractEav.php
@@ -30,7 +30,6 @@ abstract class AbstractEav extends \Magento\Catalog\Model\ResourceModel\Product\
      * @param \Magento\Eav\Model\Config $eavConfig
      * @param \Magento\Framework\Event\ManagerInterface $eventManager
      * @param null $connectionName
-     * @param \Magento\Indexer\Model\Indexer\StateFactory|null $stateFactory
      */
     public function __construct(
         \Magento\Framework\Model\ResourceModel\Db\Context $context,
diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/Price/Query/BaseFinalPrice.php b/app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/Price/Query/BaseFinalPrice.php
index 0005ac8dea58a..a82ca93d1805e 100644
--- a/app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/Price/Query/BaseFinalPrice.php
+++ b/app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/Price/Query/BaseFinalPrice.php
@@ -70,6 +70,8 @@ class BaseFinalPrice
      * @param \Magento\Framework\App\ResourceConnection $resource
      * @param JoinAttributeProcessor $joinAttributeProcessor
      * @param \Magento\Framework\Module\Manager $moduleManager
+     * @param \Magento\Framework\Event\ManagerInterface $eventManager
+     * @param \Magento\Framework\EntityManager\MetadataPool $metadataPool
      * @param string $connectionName
      */
     public function __construct(
diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/TemporaryTableStrategy.php b/app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/TemporaryTableStrategy.php
index 54673cb01bb1d..dab8dc5f866be 100644
--- a/app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/TemporaryTableStrategy.php
+++ b/app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/TemporaryTableStrategy.php
@@ -30,7 +30,7 @@ class TemporaryTableStrategy implements \Magento\Framework\Indexer\Table\Strateg
 
     /**
      * TemporaryTableStrategy constructor.
-     * @param \Magento\Framework\Indexer\Table\Strategy $strategy
+     * @param \Magento\Framework\Indexer\Table\StrategyInterface $strategy
      * @param \Magento\Framework\App\ResourceConnection $resource
      */
     public function __construct(
diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Product/Link/DeleteHandler.php b/app/code/Magento/Catalog/Model/ResourceModel/Product/Link/DeleteHandler.php
index 024c87c9fc886..5d6ce590b89c4 100644
--- a/app/code/Magento/Catalog/Model/ResourceModel/Product/Link/DeleteHandler.php
+++ b/app/code/Magento/Catalog/Model/ResourceModel/Product/Link/DeleteHandler.php
@@ -62,7 +62,7 @@ public function __construct(
     /**
      * @param string $entityType
      * @param object $entity
-     * @return object
+     * @return void
      * @throws CouldNotDeleteException
      * @throws NoSuchEntityException
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
diff --git a/app/code/Magento/Catalog/Model/Rss/Category.php b/app/code/Magento/Catalog/Model/Rss/Category.php
index a58569d1b59d7..25a638fabcefa 100644
--- a/app/code/Magento/Catalog/Model/Rss/Category.php
+++ b/app/code/Magento/Catalog/Model/Rss/Category.php
@@ -44,7 +44,7 @@ public function __construct(
     /**
      * @param \Magento\Catalog\Model\Category $category
      * @param int $storeId
-     * @return $this
+     * @return \Magento\Catalog\Model\ResourceModel\Product\Collection
      */
     public function getProductCollection(\Magento\Catalog\Model\Category $category, $storeId)
     {
diff --git a/app/code/Magento/Catalog/Model/Template/Filter.php b/app/code/Magento/Catalog/Model/Template/Filter.php
index 1eb30ff95a40b..53d8b68fe7070 100644
--- a/app/code/Magento/Catalog/Model/Template/Filter.php
+++ b/app/code/Magento/Catalog/Model/Template/Filter.php
@@ -66,7 +66,7 @@ public function __construct(
      * Set use absolute links flag
      *
      * @param bool $flag
-     * @return \Magento\Email\Model\Template\Filter
+     * @return $this
      */
     public function setUseAbsoluteLinks($flag)
     {
@@ -79,7 +79,7 @@ public function setUseAbsoluteLinks($flag)
      * Doesn't set anything intentionally, since SID is not allowed in any kind of emails
      *
      * @param bool $flag
-     * @return \Magento\Email\Model\Template\Filter
+     * @return $this
      */
     public function setUseSessionInUrl($flag)
     {
diff --git a/app/code/Magento/Catalog/Plugin/Model/ResourceModel/Config.php b/app/code/Magento/Catalog/Plugin/Model/ResourceModel/Config.php
index dfa06b6ebe6c8..d4af2f02005c2 100644
--- a/app/code/Magento/Catalog/Plugin/Model/ResourceModel/Config.php
+++ b/app/code/Magento/Catalog/Plugin/Model/ResourceModel/Config.php
@@ -47,7 +47,7 @@ public function __construct(
 
     /**
      * @param \Magento\Catalog\Model\ResourceModel\Config $config
-     * @param callable $proceed
+     * @param \Closure $proceed
      * @return array
      */
     public function aroundGetAttributesUsedInListing(
@@ -74,7 +74,7 @@ public function aroundGetAttributesUsedInListing(
 
     /**
      * @param \Magento\Catalog\Model\ResourceModel\Config $config
-     * @param callable $proceed
+     * @param \Closure $proceed
      * @return array
      */
     public function aroundGetAttributesUsedForSortBy(
diff --git a/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/Eav.php b/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/Eav.php
index 7379600011bcf..99f7122efa0a8 100755
--- a/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/Eav.php
+++ b/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/Eav.php
@@ -560,7 +560,7 @@ private function getAttributes()
      * Loads attributes for specified groups at once
      *
      * @param AttributeGroupInterface[] $groups
-     * @return @return ProductAttributeInterface[]
+     * @return ProductAttributeInterface[]
      */
     private function loadAttributesForGroups(array $groups)
     {
diff --git a/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/Eav/CompositeConfigProcessor.php b/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/Eav/CompositeConfigProcessor.php
index 5513af9d98e7d..22ac3bf0fa2b5 100644
--- a/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/Eav/CompositeConfigProcessor.php
+++ b/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/Eav/CompositeConfigProcessor.php
@@ -24,6 +24,7 @@ class CompositeConfigProcessor implements WysiwygConfigDataProcessorInterface
 
     /**
      * CompositeConfigProcessor constructor.
+     * @param Logger $logger
      * @param array $eavWysiwygDataProcessors
      */
     public function __construct(Logger $logger, array $eavWysiwygDataProcessors)
diff --git a/app/code/Magento/Catalog/Ui/DataProvider/Product/Listing/DataProvider.php b/app/code/Magento/Catalog/Ui/DataProvider/Product/Listing/DataProvider.php
index 3090734df0144..be98fff96f088 100644
--- a/app/code/Magento/Catalog/Ui/DataProvider/Product/Listing/DataProvider.php
+++ b/app/code/Magento/Catalog/Ui/DataProvider/Product/Listing/DataProvider.php
@@ -24,8 +24,6 @@ class DataProvider extends \Magento\Framework\View\Element\UiComponent\DataProvi
 
     /**
      * @param string $name
-     * @param string $primaryFieldName
-     * @param string $requestFieldName
      * @param Reporting $reporting
      * @param SearchCriteriaBuilder $searchCriteriaBuilder
      * @param RequestInterface $request
diff --git a/app/code/Magento/Catalog/Ui/DataProvider/Product/ProductRenderCollectorInterface.php b/app/code/Magento/Catalog/Ui/DataProvider/Product/ProductRenderCollectorInterface.php
index 5d14cd21f7b95..3f16e0a6617da 100644
--- a/app/code/Magento/Catalog/Ui/DataProvider/Product/ProductRenderCollectorInterface.php
+++ b/app/code/Magento/Catalog/Ui/DataProvider/Product/ProductRenderCollectorInterface.php
@@ -21,7 +21,6 @@ interface ProductRenderCollectorInterface
      *
      * @param ProductInterface $product
      * @param ProductRenderInterface $productRender
-     * @param array $data
      * @return void
      * @since 101.1.0
      */

From 204e9d83c4ce5a3bf161048c9ec86c34038ad832 Mon Sep 17 00:00:00 2001
From: Pavel Bystritsky <p.bystritsky@yandex.ru>
Date: Wed, 16 Jan 2019 14:42:36 +0200
Subject: [PATCH 56/70] ENGCOM-3850: Static test fix.

---
 app/code/Magento/Ups/Model/Carrier.php | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/app/code/Magento/Ups/Model/Carrier.php b/app/code/Magento/Ups/Model/Carrier.php
index f5990ed098c8f..43efb6a91c01f 100644
--- a/app/code/Magento/Ups/Model/Carrier.php
+++ b/app/code/Magento/Ups/Model/Carrier.php
@@ -333,9 +333,9 @@ public function setRequest(RateRequest $request)
         }
 
         // For UPS, Las Palmas and Santa Cruz de Tenerife will be represented by Canary Islands country
-        if (
-            $destCountry == self::SPAIN_COUNTRY_ID &&
-            ($request->getDestRegionCode() == self::LAS_PALMAS_REGION_ID || $request->getDestRegionCode() == self::SANTA_CRUZ_DE_TENERIFE_REGION_ID)
+        if ($destCountry === self::SPAIN_COUNTRY_ID &&
+            ($request->getDestRegionCode() === self::LAS_PALMAS_REGION_ID
+                || $request->getDestRegionCode() === self::SANTA_CRUZ_DE_TENERIFE_REGION_ID)
         ) {
             $destCountry = self::CANARY_ISLANDS_COUNTRY_ID;
         }
@@ -1708,6 +1708,7 @@ public function getCustomizableContainerTypes()
 
     /**
      * Get delivery confirmation level based on origin/destination
+     *
      * Return null if delivery confirmation is not acceptable
      *
      * @param string|null $countyDestination

From f7275c53ceaecb8a3e16a2dc286b8614ebd1aef8 Mon Sep 17 00:00:00 2001
From: Pavel Bystritsky <p.bystritsky@yandex.ru>
Date: Wed, 16 Jan 2019 15:44:26 +0200
Subject: [PATCH 57/70] ENGCOM-3846: Static test fix.

---
 lib/internal/Magento/Framework/Option/ArrayPool.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/internal/Magento/Framework/Option/ArrayPool.php b/lib/internal/Magento/Framework/Option/ArrayPool.php
index c417909cc9ddf..11e1b46ff0363 100644
--- a/lib/internal/Magento/Framework/Option/ArrayPool.php
+++ b/lib/internal/Magento/Framework/Option/ArrayPool.php
@@ -34,7 +34,8 @@ public function get($model)
     {
         $modelInstance = $this->_objectManager->get($model);
         if (false == $modelInstance instanceof \Magento\Framework\Data\OptionSourceInterface) {
-            throw new \InvalidArgumentException($model . 'doesn\'t implement \Magento\Framework\Data\OptionSourceInterface');
+            throw new \InvalidArgumentException($model
+                . 'doesn\'t implement \Magento\Framework\Data\OptionSourceInterface');
         }
         return $modelInstance;
     }

From 8d3fc5c138b4328baab27f44e6fd6d58b0149dca Mon Sep 17 00:00:00 2001
From: Pavel Bystritsky <p.bystritsky@yandex.ru>
Date: Wed, 16 Jan 2019 15:57:50 +0200
Subject: [PATCH 58/70] ENGCOM-3845: Static test fix.

---
 .../CatalogInventory/Observer/CancelOrderItemObserver.php    | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/CatalogInventory/Observer/CancelOrderItemObserver.php b/app/code/Magento/CatalogInventory/Observer/CancelOrderItemObserver.php
index c919c7057bcc6..098e254d785a5 100644
--- a/app/code/Magento/CatalogInventory/Observer/CancelOrderItemObserver.php
+++ b/app/code/Magento/CatalogInventory/Observer/CancelOrderItemObserver.php
@@ -6,10 +6,10 @@
 
 namespace Magento\CatalogInventory\Observer;
 
-use Magento\CatalogInventory\Model\Configuration;
-use Magento\Framework\Event\ObserverInterface;
 use Magento\CatalogInventory\Api\StockManagementInterface;
+use Magento\CatalogInventory\Model\Configuration;
 use Magento\Framework\Event\Observer as EventObserver;
+use Magento\Framework\Event\ObserverInterface;
 
 /**
  * Catalog inventory module observer
@@ -32,6 +32,7 @@ class CancelOrderItemObserver implements ObserverInterface
     protected $priceIndexer;
 
     /**
+     * @param Configuration $configuration
      * @param StockManagementInterface $stockManagement
      * @param \Magento\Catalog\Model\Indexer\Product\Price\Processor $priceIndexer
      */

From ec33182beef6e13f9caf2c5fc4f4d731bebccf50 Mon Sep 17 00:00:00 2001
From: Pavel Bystritsky <p.bystritsky@yandex.ru>
Date: Wed, 16 Jan 2019 16:50:24 +0200
Subject: [PATCH 59/70] ENGCOM-3869: Static test fix.

---
 .../frontend/Magento/blank/web/css/source/_navigation.less    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/design/frontend/Magento/blank/web/css/source/_navigation.less b/app/design/frontend/Magento/blank/web/css/source/_navigation.less
index 10c7e3ed7eeea..21b7315779764 100644
--- a/app/design/frontend/Magento/blank/web/css/source/_navigation.less
+++ b/app/design/frontend/Magento/blank/web/css/source/_navigation.less
@@ -133,8 +133,8 @@
         }
         .switcher-dropdown {
             .lib-list-reset-styles();
-            padding: @indent__s 0;
             display: none;
+            padding: @indent__s 0;
         }
         .switcher-options {
             &.active {
@@ -213,7 +213,7 @@
         }
 
         .nav-toggle {
-            &:after{
+            &:after {
                 background: rgba(0, 0, 0, @overlay__opacity);
                 content: '';
                 display: block;

From 3ddf6c456931ff7c1a4ea0fb2c5ef199534d8ddc Mon Sep 17 00:00:00 2001
From: nmalevanec <mikola.malevanec@transoftgroup.com>
Date: Thu, 17 Jan 2019 12:06:21 +0200
Subject: [PATCH 60/70] Fix static tests.

---
 .../Framework/DB/Adapter/AdapterInterface.php | 48 ++++++++++++-------
 1 file changed, 32 insertions(+), 16 deletions(-)

diff --git a/lib/internal/Magento/Framework/DB/Adapter/AdapterInterface.php b/lib/internal/Magento/Framework/DB/Adapter/AdapterInterface.php
index 48d488a322cb0..f654fd263f605 100644
--- a/lib/internal/Magento/Framework/DB/Adapter/AdapterInterface.php
+++ b/lib/internal/Magento/Framework/DB/Adapter/AdapterInterface.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Framework\DB\Adapter;
 
 use Magento\Framework\DB\Ddl\Table;
@@ -365,6 +366,7 @@ public function getIndexList($tableName, $schemaName = null);
 
     /**
      * Add new Foreign Key to table
+     *
      * If Foreign Key with same name is exist - it will be deleted
      *
      * @param string $fkName
@@ -373,7 +375,6 @@ public function getIndexList($tableName, $schemaName = null);
      * @param string $refTableName
      * @param string $refColumnName
      * @param string $onDelete
-     * @param string $onUpdate
      * @param boolean $purge trying remove invalid data
      * @param string $schemaName
      * @param string $refSchemaName
@@ -484,6 +485,7 @@ public function insert($table, array $bind);
 
     /**
      * Inserts a table row with specified data
+     *
      * Special for Zero values to identity column
      *
      * @param string $table
@@ -502,9 +504,9 @@ public function insertForce($table, array $bind);
      * If the $where parameter is an array of multiple clauses, they will be joined by AND, with each clause wrapped in
      * parenthesis.  If you wish to use an OR, you must give a single clause that is an instance of {@see Zend_Db_Expr}
      *
-     * @param  mixed        $table The table to update.
-     * @param  array        $bind  Column-value pairs.
-     * @param  mixed        $where UPDATE WHERE clause(s).
+     * @param  mixed $table The table to update.
+     * @param  array $bind Column-value pairs.
+     * @param  mixed $where UPDATE WHERE clause(s).
      * @return int          The number of affected rows.
      */
     public function update($table, array $bind, $where = '');
@@ -512,8 +514,8 @@ public function update($table, array $bind, $where = '');
     /**
      * Deletes table rows based on a WHERE clause.
      *
-     * @param  mixed        $table The table to update.
-     * @param  mixed        $where DELETE WHERE clause(s).
+     * @param  mixed $table The table to update.
+     * @param  mixed $where DELETE WHERE clause(s).
      * @return int          The number of affected rows.
      */
     public function delete($table, $where = '');
@@ -521,31 +523,33 @@ public function delete($table, $where = '');
     /**
      * Prepares and executes an SQL statement with bound data.
      *
-     * @param  mixed  $sql  The SQL statement with placeholders.
+     * @param  mixed $sql The SQL statement with placeholders.
      *                      May be a string or \Magento\Framework\DB\Select.
-     * @param  mixed  $bind An array of data or data itself to bind to the placeholders.
+     * @param  mixed $bind An array of data or data itself to bind to the placeholders.
      * @return \Zend_Db_Statement_Interface
      */
     public function query($sql, $bind = []);
 
     /**
      * Fetches all SQL result rows as a sequential array.
+     *
      * Uses the current fetchMode for the adapter.
      *
-     * @param string|\Magento\Framework\DB\Select $sql  An SQL SELECT statement.
-     * @param mixed                 $bind Data to bind into SELECT placeholders.
-     * @param mixed                 $fetchMode Override current fetch mode.
+     * @param string|\Magento\Framework\DB\Select $sql An SQL SELECT statement.
+     * @param mixed $bind Data to bind into SELECT placeholders.
+     * @param mixed $fetchMode Override current fetch mode.
      * @return array
      */
     public function fetchAll($sql, $bind = [], $fetchMode = null);
 
     /**
      * Fetches the first row of the SQL result.
+     *
      * Uses the current fetchMode for the adapter.
      *
      * @param string|\Magento\Framework\DB\Select $sql An SQL SELECT statement.
      * @param mixed $bind Data to bind into SELECT placeholders.
-     * @param mixed                 $fetchMode Override current fetch mode.
+     * @param mixed $fetchMode Override current fetch mode.
      * @return array
      */
     public function fetchRow($sql, $bind = [], $fetchMode = null);
@@ -622,9 +626,9 @@ public function quote($value, $type = null);
      * // $safe = "WHERE date < '2005-01-02'"
      * </code>
      *
-     * @param string  $text  The text with a placeholder.
-     * @param mixed   $value The value to quote.
-     * @param string  $type  OPTIONAL SQL datatype
+     * @param string $text The text with a placeholder.
+     * @param mixed $value The value to quote.
+     * @param string $type OPTIONAL SQL datatype
      * @param integer $count OPTIONAL count of placeholders to replace
      * @return string An SQL-safe quoted value placed into the original text.
      */
@@ -721,7 +725,8 @@ public function disallowDdlCache();
 
     /**
      * Reset cached DDL data from cache
-     * if table name is null - reset all cached DDL data
+     *
+     * If table name is null - reset all cached DDL data
      *
      * @param string $tableName
      * @param string $schemaName OPTIONAL
@@ -741,6 +746,7 @@ public function saveDdlCache($tableCacheKey, $ddlType, $data);
 
     /**
      * Load DDL data from cache
+     *
      * Return false if cache does not exists
      *
      * @param string $tableCacheKey the table cache key
@@ -784,6 +790,7 @@ public function prepareSqlCondition($fieldName, $condition);
 
     /**
      * Prepare value for save in column
+     *
      * Return converted to column data type value
      *
      * @param array $column     the column describe array
@@ -813,6 +820,7 @@ public function getIfNullSql($expression, $value = 0);
 
     /**
      * Generate fragment of SQL, that combine together (concatenate) the results from data array
+     *
      * All arguments in data must be quoted
      *
      * @param array $data
@@ -823,6 +831,7 @@ public function getConcatSql(array $data, $separator = null);
 
     /**
      * Generate fragment of SQL that returns length of character string
+     *
      * The string argument must be quoted
      *
      * @param string $string
@@ -931,6 +940,7 @@ public function getDateExtractSql($date, $unit);
 
     /**
      * Retrieve valid table name
+     *
      * Check table name length and allowed symbols
      *
      * @param string $tableName
@@ -950,6 +960,7 @@ public function getTriggerName($tableName, $time, $event);
 
     /**
      * Retrieve valid index name
+     *
      * Check index name length and allowed symbols
      *
      * @param string $tableName
@@ -961,6 +972,7 @@ public function getIndexName($tableName, $fields, $indexType = '');
 
     /**
      * Retrieve valid foreign key name
+     *
      * Check foreign key name length and allowed symbols
      *
      * @param string $priTableName
@@ -1047,6 +1059,7 @@ public function supportStraightJoin();
 
     /**
      * Adds order by random to select object
+     *
      * Possible using integer field for optimization
      *
      * @param \Magento\Framework\DB\Select $select
@@ -1074,6 +1087,7 @@ public function getPrimaryKeyName($tableName, $schemaName = null);
 
     /**
      * Converts fetched blob into raw binary PHP data.
+     *
      * Some DB drivers return blobs as hex-coded strings, so we need to process them.
      *
      * @param mixed $value
@@ -1114,6 +1128,8 @@ public function dropTrigger($triggerName, $schemaName = null);
     public function getTables($likeCondition = null);
 
     /**
+     * Generates case SQL fragment
+     *
      * Generate fragment of SQL, that check value against multiple condition cases
      * and return different result depends on them
      *

From 53274009c094a07f357d5739b3afd86dd9dc311a Mon Sep 17 00:00:00 2001
From: Ranee 2Jcommerce <ranee@2jcommerce.in>
Date: Thu, 17 Jan 2019 18:59:08 +0530
Subject: [PATCH 61/70] Order-view-invoices :: Order view invoices template not
 display proper on ipad

---
 .../Magento_Sales/web/css/source/module/_order.less       | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/app/design/adminhtml/Magento/backend/Magento_Sales/web/css/source/module/_order.less b/app/design/adminhtml/Magento/backend/Magento_Sales/web/css/source/module/_order.less
index 984556816b035..b816c2b74989c 100644
--- a/app/design/adminhtml/Magento/backend/Magento_Sales/web/css/source/module/_order.less
+++ b/app/design/adminhtml/Magento/backend/Magento_Sales/web/css/source/module/_order.less
@@ -94,6 +94,14 @@
         margin: 0;
         padding: 0;
     }
+     .admin__data-grid-pager-wrap{
+         .selectmenu {
+             margin-bottom: 10px;
+         }
+     }
+   .data-grid-search-control-wrap {
+        margin-bottom: 10px;
+    }
 }
 
 //

From 1af8c7820f59a238742979db38cd3d652f7e789b Mon Sep 17 00:00:00 2001
From: nmalevanec <mikola.malevanec@transoftgroup.com>
Date: Fri, 18 Jan 2019 10:49:39 +0200
Subject: [PATCH 62/70] Fix static test.

---
 .../Shipping/Controller/Adminhtml/Order/Shipment/Save.php        | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/code/Magento/Shipping/Controller/Adminhtml/Order/Shipment/Save.php b/app/code/Magento/Shipping/Controller/Adminhtml/Order/Shipment/Save.php
index e36292b7c2e36..100ba029beabd 100644
--- a/app/code/Magento/Shipping/Controller/Adminhtml/Order/Shipment/Save.php
+++ b/app/code/Magento/Shipping/Controller/Adminhtml/Order/Shipment/Save.php
@@ -89,6 +89,7 @@ protected function _saveShipment($shipment)
 
     /**
      * Save shipment
+     *
      * We can save only new shipment. Existing shipments are not editable
      *
      * @return \Magento\Framework\Controller\ResultInterface

From 12a0f05c811f61ae4907ca14a6b842fff70fb8f3 Mon Sep 17 00:00:00 2001
From: Nainesh <nainesh@2jcommerce.in>
Date: Fri, 18 Jan 2019 17:45:35 +0530
Subject: [PATCH 63/70] 'wishlist-page-edit-remove-item-misalign' :: On wish
 list page edit, remove item misalign in 640 X 767 resolution

---
 .../Magento/blank/Magento_Wishlist/web/css/source/_module.less   | 1 +
 .../Magento/luma/Magento_Wishlist/web/css/source/_module.less    | 1 +
 2 files changed, 2 insertions(+)

diff --git a/app/design/frontend/Magento/blank/Magento_Wishlist/web/css/source/_module.less b/app/design/frontend/Magento/blank/Magento_Wishlist/web/css/source/_module.less
index 0e8350261e002..f34ed404e86d9 100644
--- a/app/design/frontend/Magento/blank/Magento_Wishlist/web/css/source/_module.less
+++ b/app/design/frontend/Magento/blank/Magento_Wishlist/web/css/source/_module.less
@@ -194,6 +194,7 @@
 
                 &-actions {
                     display: block;
+                    float: left;
 
                     .action {
                         margin-right: 15px;
diff --git a/app/design/frontend/Magento/luma/Magento_Wishlist/web/css/source/_module.less b/app/design/frontend/Magento/luma/Magento_Wishlist/web/css/source/_module.less
index 584eefb9bc643..3b6f724508220 100644
--- a/app/design/frontend/Magento/luma/Magento_Wishlist/web/css/source/_module.less
+++ b/app/design/frontend/Magento/luma/Magento_Wishlist/web/css/source/_module.less
@@ -203,6 +203,7 @@
 
                 &-actions {
                     display: block;
+                    float: left;
 
                     .action {
                         margin-right: 15px;

From 989b0b17670c91e8ae8c91a383ba4dfb11135b30 Mon Sep 17 00:00:00 2001
From: milindsingh <milind7@live.com>
Date: Sun, 20 Jan 2019 17:13:18 +0530
Subject: [PATCH 64/70] Removed Unnecessary slash in namespace in di.xml

---
 app/code/Magento/Catalog/etc/adminhtml/di.xml    |  2 +-
 app/code/Magento/CheckoutAgreements/etc/di.xml   |  2 +-
 app/code/Magento/Elasticsearch/etc/di.xml        | 16 ++++++++--------
 .../Magento/ImportExport/etc/adminhtml/di.xml    |  2 +-
 app/code/Magento/Indexer/etc/di.xml              |  2 +-
 app/code/Magento/Sales/etc/webapi_rest/di.xml    |  2 +-
 app/code/Magento/Sales/etc/webapi_soap/di.xml    |  2 +-
 app/code/Magento/SalesRule/etc/di.xml            |  2 +-
 app/code/Magento/Theme/etc/di.xml                |  2 +-
 9 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/app/code/Magento/Catalog/etc/adminhtml/di.xml b/app/code/Magento/Catalog/etc/adminhtml/di.xml
index fddc01ac4c189..c04cfb2dce00a 100644
--- a/app/code/Magento/Catalog/etc/adminhtml/di.xml
+++ b/app/code/Magento/Catalog/etc/adminhtml/di.xml
@@ -78,7 +78,7 @@
     <type name="Magento\Catalog\Model\ResourceModel\Attribute">
         <plugin name="invalidate_pagecache_after_attribute_save" type="Magento\Catalog\Plugin\Model\ResourceModel\Attribute\Save" />
     </type>
-    <virtualType name="\Magento\Catalog\Ui\DataProvider\Product\ProductCollectionFactory" type="\Magento\Catalog\Model\ResourceModel\Product\CollectionFactory">
+    <virtualType name="Magento\Catalog\Ui\DataProvider\Product\ProductCollectionFactory" type="Magento\Catalog\Model\ResourceModel\Product\CollectionFactory">
         <arguments>
             <argument name="instanceName" xsi:type="string">\Magento\Catalog\Ui\DataProvider\Product\ProductCollection</argument>
         </arguments>
diff --git a/app/code/Magento/CheckoutAgreements/etc/di.xml b/app/code/Magento/CheckoutAgreements/etc/di.xml
index 081e3daa781ff..a8ff8f5941f96 100644
--- a/app/code/Magento/CheckoutAgreements/etc/di.xml
+++ b/app/code/Magento/CheckoutAgreements/etc/di.xml
@@ -23,7 +23,7 @@
     <type name="Magento\Checkout\Api\GuestPaymentInformationManagementInterface">
         <plugin name="validate-guest-agreements" type="Magento\CheckoutAgreements\Model\Checkout\Plugin\GuestValidation"/>
     </type>
-    <type name="\Magento\CheckoutAgreements\Model\CheckoutAgreementsList">
+    <type name="Magento\CheckoutAgreements\Model\CheckoutAgreementsList">
         <arguments>
             <argument name="collectionProcessor" xsi:type="object">Magento\CheckoutAgreements\Model\Api\SearchCriteria\CollectionProcessor</argument>
         </arguments>
diff --git a/app/code/Magento/Elasticsearch/etc/di.xml b/app/code/Magento/Elasticsearch/etc/di.xml
index 6a42e4b3c9fe2..7e219bb2f918f 100644
--- a/app/code/Magento/Elasticsearch/etc/di.xml
+++ b/app/code/Magento/Elasticsearch/etc/di.xml
@@ -68,7 +68,7 @@
             </argument>
         </arguments>
     </type>
-    <type name="\Magento\Elasticsearch\Elasticsearch5\Model\Adapter\FieldMapper\ProductFieldMapperProxy">
+    <type name="Magento\Elasticsearch\Elasticsearch5\Model\Adapter\FieldMapper\ProductFieldMapperProxy">
         <arguments>
             <argument name="productFieldMappers" xsi:type="array">
                 <item name="elasticsearch" xsi:type="object">Magento\Elasticsearch\Model\Adapter\FieldMapper\ProductFieldMapper</item>
@@ -287,7 +287,7 @@
             <argument name="fieldNameResolver" xsi:type="object">elasticsearch5FieldNameResolver</argument>
         </arguments>
     </type>
-    <type name="\Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldName\Resolver\CompositeResolver">
+    <type name="Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldName\Resolver\CompositeResolver">
         <arguments>
             <argument name="items" xsi:type="array">
                 <item name="notEav" xsi:type="object">\Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldName\Resolver\NotEavAttribute</item>
@@ -317,7 +317,7 @@
             <argument name="fieldTypeConverter" xsi:type="object">Magento\Elasticsearch\Elasticsearch5\Model\Adapter\FieldMapper\Product\FieldProvider\FieldType\Converter</argument>
         </arguments>
     </virtualType>
-    <type name="\Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldType\Resolver\CompositeResolver">
+    <type name="Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldType\Resolver\CompositeResolver">
         <arguments>
             <argument name="items" xsi:type="array">
                 <item name="integer" xsi:type="object">\Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldType\Resolver\IntegerType</item>
@@ -327,7 +327,7 @@
             </argument>
         </arguments>
     </type>
-    <type name="\Magento\Elasticsearch\Elasticsearch5\Model\Adapter\FieldMapper\Product\FieldProvider\FieldType\Resolver\CompositeResolver">
+    <type name="Magento\Elasticsearch\Elasticsearch5\Model\Adapter\FieldMapper\Product\FieldProvider\FieldType\Resolver\CompositeResolver">
         <arguments>
             <argument name="items" xsi:type="array">
                 <item name="keyword" xsi:type="object">\Magento\Elasticsearch\Elasticsearch5\Model\Adapter\FieldMapper\Product\FieldProvider\FieldType\Resolver\KeywordType</item>
@@ -368,12 +368,12 @@
             <argument name="indexTypeConverter" xsi:type="object">Magento\Elasticsearch\Elasticsearch5\Model\Adapter\FieldMapper\Product\FieldProvider\FieldIndex\Converter</argument>
         </arguments>
     </virtualType>
-    <type name="\Magento\Elasticsearch\Elasticsearch5\Model\Adapter\FieldMapper\Product\FieldProvider\FieldType\Resolver\KeywordType">
+    <type name="Magento\Elasticsearch\Elasticsearch5\Model\Adapter\FieldMapper\Product\FieldProvider\FieldType\Resolver\KeywordType">
         <arguments>
             <argument name="fieldTypeConverter" xsi:type="object">Magento\Elasticsearch\Elasticsearch5\Model\Adapter\FieldMapper\Product\FieldProvider\FieldType\Converter</argument>
         </arguments>
     </type>
-    <type name="\Magento\Elasticsearch\Elasticsearch5\Model\Adapter\FieldMapper\Product\FieldProvider\FieldType\Resolver\IntegerType">
+    <type name="Magento\Elasticsearch\Elasticsearch5\Model\Adapter\FieldMapper\Product\FieldProvider\FieldType\Resolver\IntegerType">
         <arguments>
             <argument name="fieldTypeConverter" xsi:type="object">Magento\Elasticsearch\Elasticsearch5\Model\Adapter\FieldMapper\Product\FieldProvider\FieldType\Converter</argument>
         </arguments>
@@ -393,13 +393,13 @@
             <argument name="fieldTypeConverter" xsi:type="object">Magento\Elasticsearch\Elasticsearch5\Model\Adapter\FieldMapper\Product\FieldProvider\FieldType\Converter</argument>
         </arguments>
     </virtualType>
-    <type name="\Magento\Elasticsearch\Elasticsearch5\Model\Adapter\FieldMapper\ProductFieldMapper">
+    <type name="Magento\Elasticsearch\Elasticsearch5\Model\Adapter\FieldMapper\ProductFieldMapper">
         <arguments>
             <argument name="fieldProvider" xsi:type="object">elasticsearch5FieldProvider</argument>
             <argument name="fieldNameResolver" xsi:type="object">elasticsearch5FieldNameResolver</argument>
         </arguments>
     </type>
-    <type name="\Magento\Elasticsearch\Model\Adapter\FieldMapper\ProductFieldMapper">
+    <type name="Magento\Elasticsearch\Model\Adapter\FieldMapper\ProductFieldMapper">
         <arguments>
             <argument name="attributeAdapterProvider" xsi:type="object">Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\AttributeProvider</argument>
             <argument name="fieldProvider" xsi:type="object">Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProviderInterface</argument>
diff --git a/app/code/Magento/ImportExport/etc/adminhtml/di.xml b/app/code/Magento/ImportExport/etc/adminhtml/di.xml
index 03c24c7b2bf69..8f7955e679cc2 100644
--- a/app/code/Magento/ImportExport/etc/adminhtml/di.xml
+++ b/app/code/Magento/ImportExport/etc/adminhtml/di.xml
@@ -6,7 +6,7 @@
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
-    <type name="\Magento\ImportExport\Controller\Adminhtml\Import\Start">
+    <type name="Magento\ImportExport\Controller\Adminhtml\Import\Start">
         <arguments>
             <argument name="exceptionMessageFactory" xsi:type="object">Magento\Framework\Message\ExceptionMessageLookupFactory</argument>
         </arguments>
diff --git a/app/code/Magento/Indexer/etc/di.xml b/app/code/Magento/Indexer/etc/di.xml
index c7603191e8606..76e7e7a46224b 100644
--- a/app/code/Magento/Indexer/etc/di.xml
+++ b/app/code/Magento/Indexer/etc/di.xml
@@ -42,7 +42,7 @@
         <plugin name="page-cache-indexer-reindex-clean-cache"
                 type="Magento\Indexer\Model\Processor\CleanCache" sortOrder="10"/>
     </type>
-    <type name="\Magento\Indexer\Model\ProcessManager">
+    <type name="Magento\Indexer\Model\ProcessManager">
         <arguments>
             <argument name="threadsCount" xsi:type="init_parameter">Magento\Indexer\Model\ProcessManager::THREADS_COUNT</argument>
         </arguments>
diff --git a/app/code/Magento/Sales/etc/webapi_rest/di.xml b/app/code/Magento/Sales/etc/webapi_rest/di.xml
index 6435445e0ef93..f2cbd14eb8042 100644
--- a/app/code/Magento/Sales/etc/webapi_rest/di.xml
+++ b/app/code/Magento/Sales/etc/webapi_rest/di.xml
@@ -18,7 +18,7 @@
     <type name="Magento\Framework\Reflection\DataObjectProcessor">
         <arguments>
             <argument name="processors" xsi:type="array">
-                <item name="\Magento\Sales\Model\Order\Item" xsi:type="object">Magento\Sales\Model\Order\Webapi\ChangeOutputArray\Proxy</item>
+                <item name="Magento\Sales\Model\Order\Item" xsi:type="object">Magento\Sales\Model\Order\Webapi\ChangeOutputArray\Proxy</item>
             </argument>
         </arguments>
     </type>
diff --git a/app/code/Magento/Sales/etc/webapi_soap/di.xml b/app/code/Magento/Sales/etc/webapi_soap/di.xml
index 6435445e0ef93..f2cbd14eb8042 100644
--- a/app/code/Magento/Sales/etc/webapi_soap/di.xml
+++ b/app/code/Magento/Sales/etc/webapi_soap/di.xml
@@ -18,7 +18,7 @@
     <type name="Magento\Framework\Reflection\DataObjectProcessor">
         <arguments>
             <argument name="processors" xsi:type="array">
-                <item name="\Magento\Sales\Model\Order\Item" xsi:type="object">Magento\Sales\Model\Order\Webapi\ChangeOutputArray\Proxy</item>
+                <item name="Magento\Sales\Model\Order\Item" xsi:type="object">Magento\Sales\Model\Order\Webapi\ChangeOutputArray\Proxy</item>
             </argument>
         </arguments>
     </type>
diff --git a/app/code/Magento/SalesRule/etc/di.xml b/app/code/Magento/SalesRule/etc/di.xml
index a8c350457a5a6..27c9a41503b22 100644
--- a/app/code/Magento/SalesRule/etc/di.xml
+++ b/app/code/Magento/SalesRule/etc/di.xml
@@ -179,7 +179,7 @@
         </arguments>
     </type>
 
-    <type name="\Magento\Quote\Model\Cart\CartTotalRepository">
+    <type name="Magento\Quote\Model\Cart\CartTotalRepository">
         <plugin name="coupon_label_plugin" type="Magento\SalesRule\Plugin\CartTotalRepository" />
     </type>
 </config>
diff --git a/app/code/Magento/Theme/etc/di.xml b/app/code/Magento/Theme/etc/di.xml
index 148267feeaad0..62f51e74b6007 100644
--- a/app/code/Magento/Theme/etc/di.xml
+++ b/app/code/Magento/Theme/etc/di.xml
@@ -273,7 +273,7 @@
     <type name="Magento\Config\App\Config\Source\DumpConfigSourceAggregated">
         <plugin name="designConfigTheme" type="Magento\Theme\Model\Design\Config\Plugin\Dump" sortOrder="50"/>
     </type>
-    <type name="\Magento\Theme\Model\Design\Config\Plugin\Dump">
+    <type name="Magento\Theme\Model\Design\Config\Plugin\Dump">
         <arguments>
             <argument name="themeList" xsi:type="object">Magento\Theme\Model\ResourceModel\Theme\Collection</argument>
         </arguments>

From b6d26694f68e587169ef75afbbbcabc85e073ecf Mon Sep 17 00:00:00 2001
From: Veronika Kurochkina <veronika_kurochkina@epam.com>
Date: Mon, 21 Jan 2019 15:04:18 +0300
Subject: [PATCH 65/70] MAGETWO-96413: Restricted Admin User Backend Order
 Creation Issue

- Fix static test
---
 app/code/Magento/Store/Model/Store.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/code/Magento/Store/Model/Store.php b/app/code/Magento/Store/Model/Store.php
index 8912473709048..c1ad5bdcfc068 100644
--- a/app/code/Magento/Store/Model/Store.php
+++ b/app/code/Magento/Store/Model/Store.php
@@ -33,6 +33,7 @@
  * @SuppressWarnings(PHPMD.ExcessiveClassComplexity)
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  * @SuppressWarnings(PHPMD.ExcessivePublicCount)
+ * @SuppressWarnings(PHPMD.CookieAndSessionMisuse)
  * @since 100.0.2
  */
 class Store extends AbstractExtensibleModel implements

From e1707be3de70a88305a85c71e6cc3d97ae672055 Mon Sep 17 00:00:00 2001
From: nmalevanec <mikola.malevanec@transoftgroup.com>
Date: Mon, 21 Jan 2019 14:23:13 +0200
Subject: [PATCH 66/70] Fix static tests.

---
 .../Data/ProductRender/PriceInfoInterface.php |  7 +++++
 .../Api/Data/ProductRenderInterface.php       |  5 ++++
 .../Product/Frontend/Product/Watermark.php    | 14 +++++++---
 .../Controller/Adminhtml/Category/Move.php    |  3 ++
 .../Catalog/Controller/Index/Index.php        |  7 ++++-
 .../Magento/Catalog/Helper/Product/View.php   |  2 ++
 .../Indexer/Product/Category/Action/Rows.php  |  2 ++
 .../ProductRepository/TransactionWrapper.php  |  9 ++++++
 .../Model/Product/Option/Type/Date.php        |  1 +
 .../Model/Product/Website/ReadHandler.php     |  5 ++++
 .../Catalog/Model/ProductRender/Image.php     | 28 ++++++++++++++++++-
 .../Catalog/Model/ProductRenderList.php       |  2 +-
 .../ResourceModel/AbstractCollection.php      |  9 +++++-
 .../Product/Indexer/Eav/AbstractEav.php       |  9 +++---
 .../Indexer/Price/Query/BaseFinalPrice.php    |  8 ++++--
 .../Indexer/TemporaryTableStrategy.php        |  5 ++--
 .../Product/Link/DeleteHandler.php            |  2 ++
 .../Magento/Catalog/Model/Rss/Category.php    |  5 ++--
 .../Magento/Catalog/Model/Template/Filter.php |  2 ++
 .../Plugin/Model/ResourceModel/Config.php     |  7 +++++
 .../Modifier/Eav/CompositeConfigProcessor.php |  5 +++-
 .../Product/Listing/DataProvider.php          |  2 +-
 22 files changed, 117 insertions(+), 22 deletions(-)

diff --git a/app/code/Magento/Catalog/Api/Data/ProductRender/PriceInfoInterface.php b/app/code/Magento/Catalog/Api/Data/ProductRender/PriceInfoInterface.php
index d12f54c8cdc41..9768b3c08c8ab 100644
--- a/app/code/Magento/Catalog/Api/Data/ProductRender/PriceInfoInterface.php
+++ b/app/code/Magento/Catalog/Api/Data/ProductRender/PriceInfoInterface.php
@@ -8,6 +8,7 @@
 
 /**
  * Price interface.
+ *
  * @api
  * @since 101.1.0
  */
@@ -23,6 +24,7 @@ public function getFinalPrice();
 
     /**
      * Set the final price: usually it calculated as minimal price of the product
+     *
      * Can be different depends on type of product
      *
      * @param float $finalPrice
@@ -33,6 +35,7 @@ public function setFinalPrice($finalPrice);
 
     /**
      * Retrieve max price of a product
+     *
      * E.g. for product with custom options is price with the most expensive custom option
      *
      * @return float
@@ -51,6 +54,7 @@ public function setMaxPrice($maxPrice);
 
     /**
      * Set max regular price
+     *
      * Max regular price is the same, as maximum price, except of excluding calculating special price and catalog rules
      * in it
      *
@@ -105,6 +109,8 @@ public function setSpecialPrice($specialPrice);
     public function getSpecialPrice();
 
     /**
+     * Retrieve minimal price
+     *
      * @return float
      * @since 101.1.0
      */
@@ -129,6 +135,7 @@ public function getRegularPrice();
 
     /**
      * Regular price - is price of product without discounts and special price with taxes and fixed product tax
+     *
      * Usually this price is corresponding to price in admin panel of product
      *
      * @param float $regularPrice
diff --git a/app/code/Magento/Catalog/Api/Data/ProductRenderInterface.php b/app/code/Magento/Catalog/Api/Data/ProductRenderInterface.php
index dddf046596b50..166a1aba76b61 100644
--- a/app/code/Magento/Catalog/Api/Data/ProductRenderInterface.php
+++ b/app/code/Magento/Catalog/Api/Data/ProductRenderInterface.php
@@ -55,6 +55,7 @@ public function setAddToCompareButton(ButtonInterface $compareButton);
 
     /**
      * Provide information needed for render prices and adjustments for different product types on front
+     *
      * Prices are represented in raw format and in current currency
      *
      * @return \Magento\Catalog\Api\Data\ProductRender\PriceInfoInterface
@@ -73,6 +74,7 @@ public function setPriceInfo(PriceInfoInterface $priceInfo);
 
     /**
      * Provide enough information, that needed to render image on front
+     *
      * Images can be separated by image codes
      *
      * @return \Magento\Catalog\Api\Data\ProductRender\ImageInterface[]
@@ -167,6 +169,7 @@ public function getIsSalable();
 
     /**
      * Set information about product saleability (Stock, other conditions)
+     *
      * Is used to provide information to frontend JS renders
      * You can add plugin, in order to hide product on product page or product list on front
      *
@@ -178,6 +181,7 @@ public function setIsSalable($isSalable);
 
     /**
      * Provide information about current store id or requested store id
+     *
      * Product should be assigned to provided store id
      * This setting affect store scope attributes
      *
@@ -197,6 +201,7 @@ public function setStoreId($storeId);
 
     /**
      * Provide current or desired currency code to product
+     *
      * This setting affect formatted prices*
      *
      * @return string
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Frontend/Product/Watermark.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Frontend/Product/Watermark.php
index c4cd35cdf29c5..7f80aece60ee0 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Frontend/Product/Watermark.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Frontend/Product/Watermark.php
@@ -4,15 +4,15 @@
  * See COPYING.txt for license details.
  */
 
+namespace Magento\Catalog\Block\Adminhtml\Product\Frontend\Product;
+
+use Magento\Framework\Data\Form\Element\AbstractElement;
+
 /**
  * Fieldset config form element renderer
  *
  * @author      Magento Core Team <core@magentocommerce.com>
  */
-namespace Magento\Catalog\Block\Adminhtml\Product\Frontend\Product;
-
-use Magento\Framework\Data\Form\Element\AbstractElement;
-
 class Watermark extends \Magento\Backend\Block\AbstractBlock implements
     \Magento\Framework\Data\Form\Element\Renderer\RendererInterface
 {
@@ -60,6 +60,8 @@ public function __construct(
     }
 
     /**
+     * Render form element as HTML
+     *
      * @param AbstractElement $element
      * @return string
      */
@@ -124,6 +126,8 @@ public function render(AbstractElement $element)
     }
 
     /**
+     * Get header html for render
+     *
      * @param AbstractElement $element
      * @return string
      * @SuppressWarnings(PHPMD.UnusedLocalVariable)
@@ -147,6 +151,8 @@ protected function _getHeaderHtml($element)
     }
 
     /**
+     * Get footer html for render
+     *
      * @param AbstractElement $element
      * @return string
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Category/Move.php b/app/code/Magento/Catalog/Controller/Adminhtml/Category/Move.php
index 858850e45db7f..082101ff07826 100644
--- a/app/code/Magento/Catalog/Controller/Adminhtml/Category/Move.php
+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Category/Move.php
@@ -8,6 +8,9 @@
 
 use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface;
 
+/**
+ * Move category admin controller
+ */
 class Move extends \Magento\Catalog\Controller\Adminhtml\Category implements HttpPostActionInterface
 {
     /**
diff --git a/app/code/Magento/Catalog/Controller/Index/Index.php b/app/code/Magento/Catalog/Controller/Index/Index.php
index b89f495b9edb2..bd00c97204996 100644
--- a/app/code/Magento/Catalog/Controller/Index/Index.php
+++ b/app/code/Magento/Catalog/Controller/Index/Index.php
@@ -5,7 +5,12 @@
  */
 namespace Magento\Catalog\Controller\Index;
 
-class Index extends \Magento\Framework\App\Action\Action
+use Magento\Framework\App\Action\HttpGetActionInterface;
+
+/**
+ * Catalog index page controller.
+ */
+class Index extends \Magento\Framework\App\Action\Action implements HttpGetActionInterface
 {
     /**
      * Index action
diff --git a/app/code/Magento/Catalog/Helper/Product/View.php b/app/code/Magento/Catalog/Helper/Product/View.php
index 87e93e3f20e5b..74f40a18971d5 100644
--- a/app/code/Magento/Catalog/Helper/Product/View.php
+++ b/app/code/Magento/Catalog/Helper/Product/View.php
@@ -10,7 +10,9 @@
 
 /**
  * Catalog category helper
+ *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ * @SuppressWarnings(PHPMD.CookieAndSessionMisuse)
  */
 class View extends \Magento\Framework\App\Helper\AbstractHelper
 {
diff --git a/app/code/Magento/Catalog/Model/Indexer/Product/Category/Action/Rows.php b/app/code/Magento/Catalog/Model/Indexer/Product/Category/Action/Rows.php
index eb58ed39b81b5..cb708695255d4 100644
--- a/app/code/Magento/Catalog/Model/Indexer/Product/Category/Action/Rows.php
+++ b/app/code/Magento/Catalog/Model/Indexer/Product/Category/Action/Rows.php
@@ -17,6 +17,8 @@
 use Magento\Store\Model\StoreManagerInterface;
 
 /**
+ * Category rows indexer.
+ *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class Rows extends \Magento\Catalog\Model\Indexer\Category\Product\AbstractAction
diff --git a/app/code/Magento/Catalog/Model/Plugin/ProductRepository/TransactionWrapper.php b/app/code/Magento/Catalog/Model/Plugin/ProductRepository/TransactionWrapper.php
index 0f442c6bbffc9..f51b2e4f90a64 100644
--- a/app/code/Magento/Catalog/Model/Plugin/ProductRepository/TransactionWrapper.php
+++ b/app/code/Magento/Catalog/Model/Plugin/ProductRepository/TransactionWrapper.php
@@ -7,6 +7,9 @@
  */
 namespace Magento\Catalog\Model\Plugin\ProductRepository;
 
+/**
+ * Transaction wrapper for product repository CRUD.
+ */
 class TransactionWrapper
 {
     /**
@@ -24,6 +27,8 @@ public function __construct(
     }
 
     /**
+     * Transaction wrapper for save action.
+     *
      * @param \Magento\Catalog\Api\ProductRepositoryInterface $subject
      * @param \Closure $proceed
      * @param \Magento\Catalog\Api\Data\ProductInterface $product
@@ -51,6 +56,8 @@ public function aroundSave(
     }
 
     /**
+     * Transaction wrapper for delete action.
+     *
      * @param \Magento\Catalog\Api\ProductRepositoryInterface $subject
      * @param \Closure $proceed
      * @param \Magento\Catalog\Api\Data\ProductInterface $product
@@ -76,6 +83,8 @@ public function aroundDelete(
     }
 
     /**
+     * Transaction wrapper for delete by id action.
+     *
      * @param \Magento\Catalog\Api\ProductRepositoryInterface $subject
      * @param \Closure $proceed
      * @param string $productSku
diff --git a/app/code/Magento/Catalog/Model/Product/Option/Type/Date.php b/app/code/Magento/Catalog/Model/Product/Option/Type/Date.php
index 33c37238e5bdf..2b4739ebeb736 100644
--- a/app/code/Magento/Catalog/Model/Product/Option/Type/Date.php
+++ b/app/code/Magento/Catalog/Model/Product/Option/Type/Date.php
@@ -12,6 +12,7 @@
  * Catalog product option date type
  *
  * @author     Magento Core Team <core@magentocommerce.com>
+ * @SuppressWarnings(PHPMD.CookieAndSessionMisuse)
  */
 class Date extends \Magento\Catalog\Model\Product\Option\Type\DefaultType
 {
diff --git a/app/code/Magento/Catalog/Model/Product/Website/ReadHandler.php b/app/code/Magento/Catalog/Model/Product/Website/ReadHandler.php
index 5ecabd8d43529..8acb4a6593a4c 100644
--- a/app/code/Magento/Catalog/Model/Product/Website/ReadHandler.php
+++ b/app/code/Magento/Catalog/Model/Product/Website/ReadHandler.php
@@ -9,6 +9,9 @@
 use Magento\Catalog\Model\ResourceModel\Product\Website\Link as ProductWebsiteLink;
 use Magento\Framework\EntityManager\Operation\ExtensionInterface;
 
+/**
+ * Add websites ids to product extension attributes.
+ */
 class ReadHandler implements ExtensionInterface
 {
     /**
@@ -27,6 +30,8 @@ public function __construct(
     }
 
     /**
+     * Add website ids to product extension attributes, if no set.
+     *
      * @param ProductInterface $product
      * @param array $arguments
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
diff --git a/app/code/Magento/Catalog/Model/ProductRender/Image.php b/app/code/Magento/Catalog/Model/ProductRender/Image.php
index 09416d38773fc..5e024938d37ea 100644
--- a/app/code/Magento/Catalog/Model/ProductRender/Image.php
+++ b/app/code/Magento/Catalog/Model/ProductRender/Image.php
@@ -9,12 +9,14 @@
 use Magento\Catalog\Api\Data\ProductRender\ImageInterface;
 
 /**
- * @inheritdoc
+ * Product image renderer model.
  */
 class Image extends \Magento\Framework\Model\AbstractExtensibleModel implements
     ImageInterface
 {
     /**
+     * Set url to image.
+     *
      * @param string $url
      * @return void
      */
@@ -34,6 +36,8 @@ public function getUrl()
     }
 
     /**
+     * Retrieve image code.
+     *
      * @return string
      */
     public function getCode()
@@ -42,6 +46,8 @@ public function getCode()
     }
 
     /**
+     * Set image code.
+     *
      * @param string $code
      * @return void
      */
@@ -51,6 +57,8 @@ public function setCode($code)
     }
 
     /**
+     * Set image height.
+     *
      * @param string $height
      * @return void
      */
@@ -60,6 +68,8 @@ public function setHeight($height)
     }
 
     /**
+     * Retrieve image height.
+     *
      * @return float
      */
     public function getHeight()
@@ -68,6 +78,8 @@ public function getHeight()
     }
 
     /**
+     * Retrieve image width.
+     *
      * @return float
      */
     public function getWidth()
@@ -76,6 +88,8 @@ public function getWidth()
     }
 
     /**
+     * Set image width.
+     *
      * @param string $width
      * @return void
      */
@@ -85,6 +99,8 @@ public function setWidth($width)
     }
 
     /**
+     * Retrieve image label.
+     *
      * @return string
      */
     public function getLabel()
@@ -93,6 +109,8 @@ public function getLabel()
     }
 
     /**
+     * Set image label.
+     *
      * @param string $label
      * @return void
      */
@@ -102,6 +120,8 @@ public function setLabel($label)
     }
 
     /**
+     * Retrieve image width after image resize.
+     *
      * @return float
      */
     public function getResizedWidth()
@@ -110,6 +130,8 @@ public function getResizedWidth()
     }
 
     /**
+     * Set image width after image resize.
+     *
      * @param string $width
      * @return void
      */
@@ -119,6 +141,8 @@ public function setResizedWidth($width)
     }
 
     /**
+     * Set image height after image resize.
+     *
      * @param string $height
      * @return void
      */
@@ -128,6 +152,8 @@ public function setResizedHeight($height)
     }
 
     /**
+     * Retrieve image height after image resize.
+     *
      * @return float
      */
     public function getResizedHeight()
diff --git a/app/code/Magento/Catalog/Model/ProductRenderList.php b/app/code/Magento/Catalog/Model/ProductRenderList.php
index 230fe66681e82..d1f60c098630e 100644
--- a/app/code/Magento/Catalog/Model/ProductRenderList.php
+++ b/app/code/Magento/Catalog/Model/ProductRenderList.php
@@ -17,8 +17,8 @@
 
 /**
  * Provide product render information (this information should be enough for rendering product on front)
- * for one or few products
  *
+ * Render information provided for one or few products
  */
 class ProductRenderList implements ProductRenderListInterface
 {
diff --git a/app/code/Magento/Catalog/Model/ResourceModel/AbstractCollection.php b/app/code/Magento/Catalog/Model/ResourceModel/AbstractCollection.php
index 07acd5ceb5f29..2896849b76cce 100644
--- a/app/code/Magento/Catalog/Model/ResourceModel/AbstractCollection.php
+++ b/app/code/Magento/Catalog/Model/ResourceModel/AbstractCollection.php
@@ -7,6 +7,7 @@
 
 /**
  * Flat abstract collection
+ *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 abstract class AbstractCollection extends \Magento\Framework\Model\ResourceModel\Db\VersionControl\Collection
@@ -34,7 +35,7 @@ public function setSelectCountSql(\Magento\Framework\DB\Select $countSelect)
     }
 
     /**
-     * get select count sql
+     * Get select count sql
      *
      * @return \Magento\Framework\DB\Select
      */
@@ -69,6 +70,7 @@ protected function _attributeToField($attribute)
 
     /**
      * Add attribute to select result set.
+     *
      * Backward compatibility with EAV collection
      *
      * @param string $attribute
@@ -82,6 +84,7 @@ public function addAttributeToSelect($attribute)
 
     /**
      * Specify collection select filter by attribute value
+     *
      * Backward compatibility with EAV collection
      *
      * @param string|\Magento\Eav\Model\Entity\Attribute $attribute
@@ -96,6 +99,7 @@ public function addAttributeToFilter($attribute, $condition = null)
 
     /**
      * Specify collection select order by attribute value
+     *
      * Backward compatibility with EAV collection
      *
      * @param string $attribute
@@ -110,6 +114,7 @@ public function addAttributeToSort($attribute, $dir = 'asc')
 
     /**
      * Set collection page start and records to show
+     *
      * Backward compatibility with EAV collection
      *
      * @param int $pageNum
@@ -124,6 +129,7 @@ public function setPage($pageNum, $pageSize)
 
     /**
      * Create all ids retrieving select with limitation
+     *
      * Backward compatibility with EAV collection
      *
      * @param int $limit
@@ -144,6 +150,7 @@ protected function _getAllIdsSelect($limit = null, $offset = null)
 
     /**
      * Retrieve all ids for collection
+     *
      * Backward compatibility with EAV collection
      *
      * @param int $limit
diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/Eav/AbstractEav.php b/app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/Eav/AbstractEav.php
index a28e7c04421b5..e024f0d30f1dc 100644
--- a/app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/Eav/AbstractEav.php
+++ b/app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/Eav/AbstractEav.php
@@ -24,12 +24,11 @@ abstract class AbstractEav extends \Magento\Catalog\Model\ResourceModel\Product\
     protected $_eventManager = null;
 
     /**
-     * AbstractEav constructor.
      * @param \Magento\Framework\Model\ResourceModel\Db\Context $context
      * @param \Magento\Framework\Indexer\Table\StrategyInterface $tableStrategy
      * @param \Magento\Eav\Model\Config $eavConfig
      * @param \Magento\Framework\Event\ManagerInterface $eventManager
-     * @param null $connectionName
+     * @param string $connectionName
      */
     public function __construct(
         \Magento\Framework\Model\ResourceModel\Db\Context $context,
@@ -69,7 +68,6 @@ public function reindexAll()
     /**
      * Rebuild index data by entities
      *
-     *
      * @param int|array $processIds
      * @return $this
      * @throws \Exception
@@ -87,8 +85,8 @@ public function reindexEntities($processIds)
 
     /**
      * Rebuild index data by attribute id
-     * If attribute is not indexable remove data by attribute
      *
+     * If attribute is not indexable remove data by attribute
      *
      * @param int $attributeId
      * @param bool $isIndexable
@@ -244,7 +242,8 @@ protected function _prepareRelationIndex($parentIds = null)
 
     /**
      * Retrieve condition for retrieve indexable attribute select
-     * the catalog/eav_attribute table must have alias is ca
+     *
+     * The catalog/eav_attribute table must have alias is ca
      *
      * @return string
      */
diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/Price/Query/BaseFinalPrice.php b/app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/Price/Query/BaseFinalPrice.php
index a82ca93d1805e..95fecc832fa26 100644
--- a/app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/Price/Query/BaseFinalPrice.php
+++ b/app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/Price/Query/BaseFinalPrice.php
@@ -16,6 +16,7 @@
 
 /**
  * Prepare base select for Product Price index limited by specified dimensions: website and customer group
+ *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class BaseFinalPrice
@@ -66,7 +67,6 @@ class BaseFinalPrice
     private $metadataPool;
 
     /**
-     * BaseFinalPrice constructor.
      * @param \Magento\Framework\App\ResourceConnection $resource
      * @param JoinAttributeProcessor $joinAttributeProcessor
      * @param \Magento\Framework\Module\Manager $moduleManager
@@ -91,6 +91,8 @@ public function __construct(
     }
 
     /**
+     * Build query for base final price.
+     *
      * @param Dimension[] $dimensions
      * @param string $productType
      * @param array $entityIds
@@ -287,7 +289,7 @@ private function getTotalTierPriceExpression(\Zend_Db_Expr $priceExpression)
     /**
      * Get tier price expression for table
      *
-     * @param $tableAlias
+     * @param string $tableAlias
      * @param \Zend_Db_Expr $priceExpression
      * @return \Zend_Db_Expr
      */
@@ -307,7 +309,7 @@ private function getTierPriceExpressionForTable($tableAlias, \Zend_Db_Expr $pric
     /**
      * Get connection
      *
-     * return \Magento\Framework\DB\Adapter\AdapterInterface
+     * @return \Magento\Framework\DB\Adapter\AdapterInterface
      * @throws \DomainException
      */
     private function getConnection(): \Magento\Framework\DB\Adapter\AdapterInterface
diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/TemporaryTableStrategy.php b/app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/TemporaryTableStrategy.php
index dab8dc5f866be..89daab2885970 100644
--- a/app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/TemporaryTableStrategy.php
+++ b/app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/TemporaryTableStrategy.php
@@ -66,9 +66,10 @@ public function getTableName($tablePrefix)
     }
 
     /**
-     * Create temporary index table based on memory table
+     * Create temporary index table based on memory table{@inheritdoc}
      *
-     * {@inheritdoc}
+     * @param string $tablePrefix
+     * @return string
      */
     public function prepareTableName($tablePrefix)
     {
diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Product/Link/DeleteHandler.php b/app/code/Magento/Catalog/Model/ResourceModel/Product/Link/DeleteHandler.php
index 5d6ce590b89c4..a554ff2641dfe 100644
--- a/app/code/Magento/Catalog/Model/ResourceModel/Product/Link/DeleteHandler.php
+++ b/app/code/Magento/Catalog/Model/ResourceModel/Product/Link/DeleteHandler.php
@@ -60,6 +60,8 @@ public function __construct(
     }
 
     /**
+     * Delete linked product.
+     *
      * @param string $entityType
      * @param object $entity
      * @return void
diff --git a/app/code/Magento/Catalog/Model/Rss/Category.php b/app/code/Magento/Catalog/Model/Rss/Category.php
index 25a638fabcefa..653d86b177a52 100644
--- a/app/code/Magento/Catalog/Model/Rss/Category.php
+++ b/app/code/Magento/Catalog/Model/Rss/Category.php
@@ -6,8 +6,7 @@
 namespace Magento\Catalog\Model\Rss;
 
 /**
- * Class Category
- * @package Magento\Catalog\Model\Rss
+ * Rss Category model.
  */
 class Category
 {
@@ -42,6 +41,8 @@ public function __construct(
     }
 
     /**
+     * Get products for given category.
+     *
      * @param \Magento\Catalog\Model\Category $category
      * @param int $storeId
      * @return \Magento\Catalog\Model\ResourceModel\Product\Collection
diff --git a/app/code/Magento/Catalog/Model/Template/Filter.php b/app/code/Magento/Catalog/Model/Template/Filter.php
index 53d8b68fe7070..8cd61415b958a 100644
--- a/app/code/Magento/Catalog/Model/Template/Filter.php
+++ b/app/code/Magento/Catalog/Model/Template/Filter.php
@@ -76,6 +76,7 @@ public function setUseAbsoluteLinks($flag)
 
     /**
      * Setter whether SID is allowed in store directive
+     *
      * Doesn't set anything intentionally, since SID is not allowed in any kind of emails
      *
      * @param bool $flag
@@ -132,6 +133,7 @@ public function mediaDirective($construction)
 
     /**
      * Retrieve store URL directive
+     *
      * Support url and direct_url properties
      *
      * @param array $construction
diff --git a/app/code/Magento/Catalog/Plugin/Model/ResourceModel/Config.php b/app/code/Magento/Catalog/Plugin/Model/ResourceModel/Config.php
index d4af2f02005c2..b942f5570f57d 100644
--- a/app/code/Magento/Catalog/Plugin/Model/ResourceModel/Config.php
+++ b/app/code/Magento/Catalog/Plugin/Model/ResourceModel/Config.php
@@ -8,6 +8,9 @@
 use Magento\Framework\App\ObjectManager;
 use Magento\Framework\Serialize\SerializerInterface;
 
+/**
+ * Config cache plugin.
+ */
 class Config
 {
     /**#@+
@@ -46,6 +49,8 @@ public function __construct(
     }
 
     /**
+     * Cache attribute used in listing.
+     *
      * @param \Magento\Catalog\Model\ResourceModel\Config $config
      * @param \Closure $proceed
      * @return array
@@ -73,6 +78,8 @@ public function aroundGetAttributesUsedInListing(
     }
 
     /**
+     * Cache attributes used for sorting.
+     *
      * @param \Magento\Catalog\Model\ResourceModel\Config $config
      * @param \Closure $proceed
      * @return array
diff --git a/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/Eav/CompositeConfigProcessor.php b/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/Eav/CompositeConfigProcessor.php
index 22ac3bf0fa2b5..fed94193225f8 100644
--- a/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/Eav/CompositeConfigProcessor.php
+++ b/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/Eav/CompositeConfigProcessor.php
@@ -10,6 +10,9 @@
 
 use Psr\Log\LoggerInterface as Logger;
 
+/**
+ * Process config for Wysiwyg.
+ */
 class CompositeConfigProcessor implements WysiwygConfigDataProcessorInterface
 {
     /**
@@ -34,7 +37,7 @@ public function __construct(Logger $logger, array $eavWysiwygDataProcessors)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function process(\Magento\Catalog\Api\Data\ProductAttributeInterface $attribute)
     {
diff --git a/app/code/Magento/Catalog/Ui/DataProvider/Product/Listing/DataProvider.php b/app/code/Magento/Catalog/Ui/DataProvider/Product/Listing/DataProvider.php
index be98fff96f088..4de0b94d06801 100644
--- a/app/code/Magento/Catalog/Ui/DataProvider/Product/Listing/DataProvider.php
+++ b/app/code/Magento/Catalog/Ui/DataProvider/Product/Listing/DataProvider.php
@@ -59,7 +59,7 @@ public function __construct(
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getData()
     {

From 13ab5eaa2c5229f87952ac2ce90e00ea718f6e3b Mon Sep 17 00:00:00 2001
From: Devagouda Patil <depatil@Devagoudas-MacBook-Pro.local>
Date: Tue, 22 Jan 2019 10:45:47 -0600
Subject: [PATCH 67/70] MC-5593: [Modularity] Braintree module MFTF contain
 wide used sections and action groups - removed duplicate entry of reports
 element

---
 app/code/Magento/Backend/Test/Mftf/Section/AdminMenuSection.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/code/Magento/Backend/Test/Mftf/Section/AdminMenuSection.xml b/app/code/Magento/Backend/Test/Mftf/Section/AdminMenuSection.xml
index 30c3c4bbca3b3..278a738b60f0f 100644
--- a/app/code/Magento/Backend/Test/Mftf/Section/AdminMenuSection.xml
+++ b/app/code/Magento/Backend/Test/Mftf/Section/AdminMenuSection.xml
@@ -19,7 +19,6 @@
         <element name="dashboard" type="button" selector="//li[@id='menu-magento-backend-dashboard']"/>
         <element name="sales" type="button" selector="//li[@id='menu-magento-sales-sales']"/>
         <element name="marketing" type="button" selector="//li[@id='menu-magento-backend-marketing']"/>
-        <element name="reports" type="button" selector="//li[@id='menu-magento-reports-report']"/>
         <element name="system" type="button" selector="//li[@id='menu-magento-backend-system']"/>
         <element name="findPartners" type="button" selector="//li[@id='menu-magento-marketplace-partners']"/>
     </section>

From 3320d6687ac5b2e666d98b5039270624b082f12c Mon Sep 17 00:00:00 2001
From: Stanislav Idolov <sidolov@magento.com>
Date: Tue, 22 Jan 2019 11:55:43 -0600
Subject: [PATCH 68/70] magento-engcom/magento2ce#2476: Fixed code style issue

---
 app/code/Magento/Wishlist/Controller/Index/Update.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/app/code/Magento/Wishlist/Controller/Index/Update.php b/app/code/Magento/Wishlist/Controller/Index/Update.php
index 332edbedc6ef4..b56aa4b5b3c8d 100755
--- a/app/code/Magento/Wishlist/Controller/Index/Update.php
+++ b/app/code/Magento/Wishlist/Controller/Index/Update.php
@@ -6,10 +6,14 @@
 namespace Magento\Wishlist\Controller\Index;
 
 use Magento\Framework\App\Action;
+use Magento\Framework\App\Action\HttpPostActionInterface;
 use Magento\Framework\Exception\NotFoundException;
 use Magento\Framework\Controller\ResultFactory;
 
-class Update extends \Magento\Wishlist\Controller\AbstractIndex
+/**
+ * Class Update
+ */
+class Update extends \Magento\Wishlist\Controller\AbstractIndex implements HttpPostActionInterface
 {
     /**
      * @var \Magento\Wishlist\Controller\WishlistProviderInterface

From 2640e04b1f7b4af259e66034395cb91a43aee792 Mon Sep 17 00:00:00 2001
From: Oleksandr Miroshnichenko <omiroshnichenko@magento.com>
Date: Tue, 22 Jan 2019 12:05:32 -0600
Subject: [PATCH 69/70] MC-5545: RSS feed works only from cache

---
 .../Catalog/Block/Adminhtml/Rss/NotifyStock.php     | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Rss/NotifyStock.php b/app/code/Magento/Catalog/Block/Adminhtml/Rss/NotifyStock.php
index eb6da28d268f7..c296a5aa0dbbd 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Rss/NotifyStock.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Rss/NotifyStock.php
@@ -9,6 +9,7 @@
 
 /**
  * Class NotifyStock
+ *
  * @package Magento\Catalog\Block\Adminhtml\Rss
  */
 class NotifyStock extends \Magento\Backend\Block\AbstractBlock implements DataProviderInterface
@@ -41,7 +42,7 @@ public function __construct(
     }
 
     /**
-     * @return void
+     * @inheritdoc
      */
     protected function _construct()
     {
@@ -50,7 +51,7 @@ protected function _construct()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getRssData()
     {
@@ -73,7 +74,7 @@ public function getRssData()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getCacheLifetime()
     {
@@ -81,7 +82,7 @@ public function getCacheLifetime()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function isAllowed()
     {
@@ -89,7 +90,7 @@ public function isAllowed()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getFeeds()
     {
@@ -97,7 +98,7 @@ public function getFeeds()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function isAuthRequired()
     {

From 40a62741285b064fd9e4850244605e2dfed44a16 Mon Sep 17 00:00:00 2001
From: Nainesh <nainesh@2jcommerce.in>
Date: Thu, 17 Jan 2019 16:54:48 +0530
Subject: [PATCH 70/70] 'Fixes-for-customer-login-page-input-field' :: On
 customer login page input field are short width on tablet view

---
 .../Magento/blank/Magento_Customer/web/css/source/_module.less  | 2 +-
 .../Magento/luma/Magento_Customer/web/css/source/_module.less   | 2 +-
 2 files changed, 2 insertions(+), 2 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 9df59ca5dac92..a94fedbcbbd14 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
@@ -421,7 +421,7 @@
 
             > .field {
                 > .control {
-                    width: 55%;
+                    width: 80%;
                 }
             }
         }
diff --git a/app/design/frontend/Magento/luma/Magento_Customer/web/css/source/_module.less b/app/design/frontend/Magento/luma/Magento_Customer/web/css/source/_module.less
index 2e7856d390bd0..61fc2610fc2e5 100755
--- a/app/design/frontend/Magento/luma/Magento_Customer/web/css/source/_module.less
+++ b/app/design/frontend/Magento/luma/Magento_Customer/web/css/source/_module.less
@@ -375,7 +375,7 @@
         .fieldset {
             > .field {
                 > .control {
-                    width: 55%;
+                    width: 80%;
                 }
             }
         }