magento
diff --git a/‎.github/PULL_REQUEST_TEMPLATE.md‎
Lines changed: 1 addition & 0 deletions b/‎.github/PULL_REQUEST_TEMPLATE.md‎
Lines changed: 1 addition & 0 deletions
diff --git a/‎app/code/Magento/Backend/Block/Store/Switcher.php‎
Lines changed: 3 additions & 1 deletion b/‎app/code/Magento/Backend/Block/Store/Switcher.php‎
Lines changed: 3 additions & 1 deletion
diff --git a/‎app/code/Magento/Backend/view/adminhtml/templates/store/switcher.phtml‎
Lines changed: 117 additions & 207 deletions b/‎app/code/Magento/Backend/view/adminhtml/templates/store/switcher.phtml‎
Lines changed: 117 additions & 207 deletions
diff --git a/‎app/code/Magento/Backend/view/adminhtml/web/js/store-switcher.js‎
Lines changed: 127 additions & 0 deletions b/‎app/code/Magento/Backend/view/adminhtml/web/js/store-switcher.js‎
Lines changed: 127 additions & 0 deletions
diff --git a/‎app/code/Magento/Catalog/Model/Product/Configuration/Item/ItemResolverComposite.php‎
Lines changed: 1 addition & 1 deletion b/‎app/code/Magento/Catalog/Model/Product/Configuration/Item/ItemResolverComposite.php‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminFillProductNameOnProductFormActionGroup.xml‎
Lines changed: 20 additions & 0 deletions b/‎app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminFillProductNameOnProductFormActionGroup.xml‎
Lines changed: 20 additions & 0 deletions
diff --git a/‎app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminFillProductQtyOnProductFormActionGroup.xml‎
Lines changed: 20 additions & 0 deletions b/‎app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminFillProductQtyOnProductFormActionGroup.xml‎
Lines changed: 20 additions & 0 deletions
diff --git a/‎app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminFillProductSkuOnProductFormActionGroup.xml‎
Lines changed: 20 additions & 0 deletions b/‎app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminFillProductSkuOnProductFormActionGroup.xml‎
Lines changed: 20 additions & 0 deletions
diff --git a/‎app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateProductDuplicateUrlkeyTest/AdminCreateProductDuplicateUrlkeyTest.xml‎
Lines changed: 16 additions & 5 deletions b/‎app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateProductDuplicateUrlkeyTest/AdminCreateProductDuplicateUrlkeyTest.xml‎
Lines changed: 16 additions & 5 deletions
diff --git a/‎app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateSimpleProductTest/AdminCreateSimpleProductNegativePriceTest.xml‎
Lines changed: 14 additions & 5 deletions b/‎app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateSimpleProductTest/AdminCreateSimpleProductNegativePriceTest.xml‎
Lines changed: 14 additions & 5 deletions
@@ -43,4 +43,5 @@
  - [ ] Pull request has a meaningful description of its purpose
  - [ ] All commits are accompanied by meaningful commit messages
  - [ ] All new or changed code is covered with unit/integration tests (if applicable)
+ - [ ] README.md files for modified modules are updated and included in the pull request if any [README.md predefined sections](https://github.com/magento/devdocs/wiki/Magento-module-README.md) require an update
  - [ ] All automated tests passed successfully (all builds are green)
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
 
 namespace Magento\Backend\Block\Store;
 
@@ -114,7 +115,8 @@ protected function _construct()
     {
         parent::_construct();
 
-        $this->setUseConfirm(true);
+        $this->setUseConfirm($this->hasData('use_confirm') ? (bool)$this->getData('use_confirm') : true);
+
         $this->setUseAjax(true);
 
         $this->setShowManageStoresLink(0);
 
@@ -0,0 +1,127 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+define([
+    'jquery'
+], function ($) {
+    'use strict';
+
+    /**
+     * @param {Object} storeSwitchConfig
+     */
+    return function (storeSwitchConfig) {
+        var scopeSwitcherHandler;
+
+        (function () {
+            var storesList = $('[data-role=stores-list]');
+
+            storesList.on('click', '[data-value]', function (event) {
+                var val = $(event.target).data('value'),
+                    role = $(event.target).data('role'),
+                    switcher = $('[data-role=' + role + ']');
+
+                event.preventDefault();
+
+                if (!switcher.val() || val !== switcher.val()) {
+
+                    /* Set the value & trigger event */
+                    switcher.val(val).trigger('change');
+                }
+            });
+        })($);
+
+        /**
+         * Switch store scope
+         *
+         * @param {Object} obj
+         * @return void
+         */
+        function switchScope(obj) {
+            var switcher = $(obj),
+                scopeId = switcher.val(),
+                scopeParams = '',
+                switcherParams = {};
+
+            if (scopeId) {
+                scopeParams = switcher.data('param') + '/' + scopeId + '/';
+            }
+
+            if (obj.switchParams) {
+                scopeParams += obj.switchParams;
+            }
+
+            /**
+             * Reload function for switcher
+             */
+            function reload() {
+                var url;
+
+                if (!storeSwitchConfig.isUsingIframe) {
+
+                    if (storeSwitchConfig.switchUrl && storeSwitchConfig.switchUrl.length > 0) {
+                        url = storeSwitchConfig.switchUrl + scopeParams;
+
+                        /* eslint-disable no-undef */
+                        setLocation(url);
+                    }
+
+                } else {
+                    $('#preview_selected_store').val(scopeId);
+                    $('#preview_form').submit();
+
+                    $('.store-switcher .dropdown-menu li a').each(function () {
+                        var $this = $(this);
+
+                        if ($this.data('role') === 'store-view-id' && $this.data('value') === scopeId) {
+                            $('#store-change-button').html($this.text());
+                        }
+                    });
+
+                    $('#store-change-button').click();
+                }
+            }
+
+            if (typeof scopeSwitcherHandler !== 'undefined') {
+                switcherParams = {
+                    scopeId: scopeId,
+                    scopeParams: scopeParams,
+                    useConfirm: storeSwitchConfig.useConfirm
+                };
+
+                scopeSwitcherHandler(switcherParams);
+            } else if (storeSwitchConfig.useConfirm) {
+                require([
+                    'Magento_Ui/js/modal/confirm',
+                    'mage/translate'
+                ], function (confirm, $t) {
+                    confirm({
+                        content: $t('Please confirm scope switching. All data that hasn\'t been saved will be lost.'),
+                        actions: {
+
+                            /**
+                             * Confirm action
+                             */
+                            confirm: function () {
+                                reload();
+                            },
+
+                            /**
+                             * Cancel action
+                             */
+                            cancel: function () {
+                                obj.value = storeSwitchConfig.storeId ? storeSwitchConfig.storeId : '';
+                            }
+                        }
+                    });
+                });
+            } else {
+                reload();
+            }
+        }
+
+        window.scopeSwitcherHandler = scopeSwitcherHandler;
+        window.switchScope = switchScope;
+    };
+});
@@ -16,7 +16,7 @@
 class ItemResolverComposite implements ItemResolverInterface
 {
     /** @var string[] */
-    private $itemResolvers = [];
+    private $itemResolvers;
 
     /** @var ItemResolverInterface[] */
     private $itemResolversInstances = [];
 
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="AdminFillProductNameOnProductFormActionGroup">
+        <annotations>
+            <description>Fills in Name field on the Admin Products creation/edit page.</description>
+        </annotations>
+        <arguments>
+            <argument name="productName" type="string"/>
+        </arguments>
+        <fillField selector="{{AdminProductFormSection.productName}}" userInput="{{productName}}" stepKey="fillProductName"/>
+    </actionGroup>
+</actionGroups>
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="AdminFillProductQtyOnProductFormActionGroup">
+        <annotations>
+            <description>Fills in Quantity field on the Admin Products creation/edit page.</description>
+        </annotations>
+        <arguments>
+            <argument name="productQty" type="string"/>
+        </arguments>
+        <fillField selector="{{AdminProductFormSection.productQuantity}}" userInput="{{productQty}}" stepKey="fillProductQty"/>
+    </actionGroup>
+</actionGroups>
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="AdminFillProductSkuOnProductFormActionGroup">
+        <annotations>
+            <description>Fills in Sku field on the Admin Products creation/edit page.</description>
+        </annotations>
+        <arguments>
+            <argument name="productSku" type="string"/>
+        </arguments>
+        <fillField selector="{{AdminProductFormSection.productSku}}" userInput="{{productSku}}" stepKey="fillProductSku"/>
+    </actionGroup>
+</actionGroups>
@@ -32,13 +32,24 @@
         <actionGroup ref="AdminClickAddProductToggleAndSelectProductTypeActionGroup" stepKey="clickAddSimpleProduct">
             <argument name="productType" value="simple"/>
         </actionGroup>
-        <fillField userInput="$$simpleProduct.name$$new" selector="{{AdminProductFormSection.productName}}" stepKey="fillName"/>
-        <fillField userInput="$$simpleProduct.sku$$new" selector="{{AdminProductFormSection.productSku}}" stepKey="fillSKU"/>
-        <fillField userInput="$$simpleProduct.price$$" selector="{{AdminProductFormSection.productPrice}}" stepKey="fillPrice"/>
-        <fillField userInput="$$simpleProduct.quantity$$" selector="{{AdminProductFormSection.productQuantity}}" stepKey="fillQuantity"/>
+        <actionGroup ref="AdminFillProductNameOnProductFormActionGroup" stepKey="fillName">
+            <argument name="productName" value="$$simpleProduct.name$$new"/>
+        </actionGroup>
+        <actionGroup ref="AdminFillProductSkuOnProductFormActionGroup" stepKey="fillSKU">
+            <argument name="productSku" value="$$simpleProduct.sku$$new"/>
+        </actionGroup>
+        <actionGroup ref="AdminFillProductPriceFieldAndPressEnterOnProductEditPageActionGroup" stepKey="fillPrice">
+            <argument name="price" value="$$simpleProduct.price$$"/>
+        </actionGroup>
+        <actionGroup ref="AdminFillProductQtyOnProductFormActionGroup" stepKey="fillQuantity">
+            <argument name="productQty" value="$$simpleProduct.quantity$$"/>
+        </actionGroup>
         <click selector="{{AdminProductSEOSection.sectionHeader}}" stepKey="openSeoSection"/>
         <fillField userInput="$$simpleProduct.custom_attributes[url_key]$$" selector="{{AdminProductSEOSection.urlKeyInput}}" stepKey="fillUrlKey"/>
         <actionGroup ref="AdminProductFormSaveActionGroup" stepKey="saveProduct"/>
-        <see userInput="The value specified in the URL Key field would generate a URL that already exists" selector="{{AdminProductMessagesSection.errorMessage}}" stepKey="assertErrorMessage"/>
+        <actionGroup ref="AssertMessageInAdminPanelActionGroup" stepKey="assertErrorMessage">
+            <argument name="messageType" value="error"/>
+            <argument name="message" value="The value specified in the URL Key field would generate a URL that already exists"/>
+        </actionGroup>
     </test>
 </tests>
@@ -18,11 +18,20 @@
             <group value="product"/>
         </annotations>
         <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
-        <amOnPage url="{{AdminProductCreatePage.url(SimpleProduct.visibility, SimpleProduct.type_id)}}" stepKey="goToCreateProduct"/>
-        <waitForPageLoad stepKey="wait1"/>
-        <fillField selector="{{AdminProductFormSection.productName}}" userInput="{{SimpleProduct.name}}" stepKey="fillName"/>
-        <fillField selector="{{AdminProductFormSection.productPrice}}" userInput="-42" stepKey="fillPrice"/>
+        <actionGroup ref="AdminOpenNewProductFormPageActionGroup" stepKey="goToCreateProduct"/>
+        <comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="wait1"/>
+        <comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="fillName"/>
+        <actionGroup ref="FillMainProductFormByStringActionGroup" stepKey="fillPrice">
+            <argument name="productName" value="{{SimpleProduct.name}}"/>
+            <argument name="productSku" value="{{SimpleProduct.sku}}"/>
+            <argument name="productPrice" value="-42"/>
+            <argument name="productQuantity" value="{{SimpleProduct.quantity}}"/>
+            <argument name="productStatus" value="{{SimpleProduct.status}}"/>
+            <argument name="productWeight" value="{{SimpleProduct.weight}}"/>
+        </actionGroup>
         <actionGroup ref="AdminProductFormSaveActionGroup" stepKey="clickSave"/>
-        <see selector="{{AdminProductFormSection.priceFieldError}}" userInput="Please enter a number 0 or greater in this field." stepKey="seePriceValidationError"/>
+        <actionGroup ref="AssertAdminValidationErrorAppearedForPriceFieldOnProductEditPageActionGroup" stepKey="seePriceValidationError">
+            <argument name="errorMessage" value="Please enter a number 0 or greater in this field."/>
+        </actionGroup>
     </test>
 </tests>
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@`
`16`	`16`	`class ItemResolverComposite implements ItemResolverInterface`
`17`	`17`	`{`
`18`	`18`	`/** @var string[] */`
`19`		`- private $itemResolvers = [];`
	`19`	`+ private $itemResolvers;`
`20`	`20`
`21`	`21`	`/** @var ItemResolverInterface[] */`
`22`	`22`	`private $itemResolversInstances = [];`