Merge remote-tracking branch 'remotes/mainline/2.3-develop' into MC-17814

Author: danmooney2

app/code/Magento/Analytics/Test/Mftf/Section/AdminConfigAdvancedReportingSection.xml

@@ -14,8 +14,8 @@
         <element name="advancedReportingIndustry" type="select" selector="#analytics_general_vertical"/>
         <element name="advancedReportingIndustryLabel" type="text" selector=".config-vertical-label>label>span"/>
         <element name="advancedReportingHour" type="select" selector="#row_analytics_general_collection_time>td:nth-child(2)>select:nth-child(2)"/>
-        <element name="advancedReportingMinute" type="select" selector="#row_analytics_general_collection_time>td:nth-child(2)>select:nth-child(3)"/>
-        <element name="advancedReportingSeconds" type="select" selector="#row_analytics_general_collection_time>td:nth-child(2)>select:nth-child(4)"/>
+        <element name="advancedReportingMinute" type="select" selector="#row_analytics_general_collection_time>td:nth-child(2)>select:nth-child(4)"/>
+        <element name="advancedReportingSeconds" type="select" selector="#row_analytics_general_collection_time>td:nth-child(2)>select:nth-child(6)"/>
         <element name="advancedReportingBlankIndustryError" type="text" selector=".message-error>div"/>
     </section>
 </sections>

app/code/Magento/Backend/Block/Dashboard/Bar.php

@@ -5,6 +5,8 @@
  */
 namespace Magento\Backend\Block\Dashboard;
 
+use Magento\Store\Model\Store;
+
 /**
  * Adminhtml dashboard bar block
  *
@@ -23,6 +25,8 @@ class Bar extends \Magento\Backend\Block\Dashboard\AbstractDashboard
     protected $_currentCurrencyCode = null;
 
     /**
+     * Get totals
+     *
      * @return array
      */
     public function getTotals()
@@ -31,6 +35,8 @@ public function getTotals()
     }
 
     /**
+     * Add total
+     *
      * @param string $label
      * @param float $value
      * @param bool $isQuantity
@@ -73,6 +79,7 @@ public function setCurrency($currency)
      * Retrieve currency model if not set then return currency model for current store
      *
      * @return \Magento\Directory\Model\Currency
+     * @SuppressWarnings(PHPMD.RequestAwareBlockMethod)
      */
     public function getCurrency()
     {
@@ -90,7 +97,8 @@ public function getCurrency()
                     $this->getRequest()->getParam('group')
                 )->getWebsite()->getBaseCurrency();
             } else {
-                $this->_currentCurrencyCode = $this->_storeManager->getStore()->getBaseCurrency();
+                $this->_currentCurrencyCode = $this->_storeManager->getStore(Store::DEFAULT_STORE_ID)
+                    ->getBaseCurrency();
             }
         }
 

app/code/Magento/Backend/Block/Widget/Grid/Column/Multistore.php

@@ -3,6 +3,8 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Backend\Block\Widget\Grid\Column;
 
 /**
@@ -14,15 +16,6 @@
  */
 class Multistore extends \Magento\Backend\Block\Widget\Grid\Column
 {
-    /**
-     * @param \Magento\Backend\Block\Template\Context $context
-     * @param array $data
-     */
-    public function __construct(\Magento\Backend\Block\Template\Context $context, array $data = [])
-    {
-        parent::__construct($context, $data);
-    }
-
     /**
      * Get header css class name
      *

app/code/Magento/Backend/Test/Mftf/Test/AdminDashboardWithChartsChart.xml

@@ -83,7 +83,9 @@
         <!-- Create invoice -->
         <comment userInput="Create invoice" stepKey="createInvoice"/>
         <click selector="{{AdminOrdersGridSection.firstRow}}" stepKey="clickOrderRow"/>
+        <waitForPageLoad stepKey="waitForOrderPageToLoad"/>
         <click selector="{{AdminOrderDetailsMainActionsSection.invoice}}" stepKey="clickInvoiceButton"/>
+        <waitForPageLoad stepKey="waitForInvoicePageToLoad"/>
         <see selector="{{AdminHeaderSection.pageTitle}}" userInput="New Invoice" stepKey="seeNewInvoiceInPageTitle" after="clickInvoiceButton"/>
         <see selector="{{AdminInvoiceTotalSection.total('Subtotal')}}" userInput="$150.00" stepKey="seeCorrectGrandTotal"/>
         <click selector="{{AdminInvoiceMainActionsSection.submitInvoice}}" stepKey="clickSubmitInvoice"/>

app/code/Magento/Backend/view/adminhtml/templates/store/switcher.phtml

@@ -36,7 +36,6 @@
             <?php if ($block->hasDefaultOption()) : ?>
                 <li class="store-switcher-all <?php if (!($block->getDefaultSelectionName() != $block->getCurrentSelectionName())) : ?>disabled<?php endif; ?> <?php if (!$block->hasScopeSelected()) : ?>current<?php endif; ?>">
                     <?php if ($block->getDefaultSelectionName() != $block->getCurrentSelectionName()) : ?>
-                        ?>
                         <a data-role="store-view-id" data-value="" href="#">
                             <?= $block->escapeHtml($block->getDefaultSelectionName()) ?>
                         </a>

app/code/Magento/Catalog/Helper/Product.php

@@ -14,6 +14,7 @@
 /**
  * Catalog category helper
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ * @SuppressWarnings(PHPMD.CookieAndSessionMisuse)
  */
 class Product extends \Magento\Framework\Url\Helper\Data
 {
@@ -268,6 +269,8 @@ public function getThumbnailUrl($product)
     }
 
     /**
+     * Retrieve email to friend url
+     *
      * @param ModelProduct $product
      * @return string
      */
@@ -282,6 +285,8 @@ public function getEmailToFriendUrl($product)
     }
 
     /**
+     * Get statuses
+     *
      * @return array
      */
     public function getStatuses()
@@ -476,6 +481,7 @@ public function initProduct($productId, $controller, $params = null)
 
     /**
      * Prepares product options by buyRequest: retrieves values and assigns them as default.
+     *
      * Also parses and adds product management related values - e.g. qty
      *
      * @param ModelProduct $product
@@ -493,6 +499,7 @@ public function prepareProductOptions($product, $buyRequest)
 
     /**
      * Process $buyRequest and sets its options before saving configuration to some product item.
+     *
      * This method is used to attach additional parameters to processed buyRequest.
      *
      * $params holds parameters of what operation must be performed:
@@ -541,8 +548,6 @@ public function addParamsToBuyRequest($buyRequest, $params)
     /**
      * Set flag that shows if Magento has to check product to be saleable (enabled and/or inStock)
      *
-     * For instance, during order creation in the backend admin has ability to add any products to order
-     *
      * @param bool $skipSaleableCheck
      * @return Product
      */

app/code/Magento/Catalog/Plugin/Block/Topmenu.php

@@ -14,6 +14,11 @@
  */
 class Topmenu
 {
+    /**
+     * Cache tag for menu block
+     */
+    private $cacheTag = "top_menu";
+
     /**
      * Catalog category
      *
@@ -119,6 +124,7 @@ public function beforeGetIdentities(\Magento\Theme\Block\Html\Topmenu $subject)
         $subject->addIdentity(Category::CACHE_TAG);
         $rootId = $this->storeManager->getStore()->getRootCategoryId();
         $storeId = $this->storeManager->getStore()->getId();
+        $currentCategory = $this->getCurrentCategory();
         /** @var \Magento\Catalog\Model\ResourceModel\Category\Collection $collection */
         $collection = $this->getCategoryTree($storeId, $rootId);
         $mapping = [$rootId => $subject->getMenu()];  // use nodes stack to avoid recursion
@@ -128,6 +134,9 @@ public function beforeGetIdentities(\Magento\Theme\Block\Html\Topmenu $subject)
             }
             $subject->addIdentity(Category::CACHE_TAG . '_' . $category->getId());
         }
+        if ($currentCategory) {
+            $subject->addIdentity($this->cacheTag . '_' . Category::CACHE_TAG . '_' . $currentCategory->getId());
+        }
     }
 
     /**

app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductAttributeActionGroup.xml

@@ -43,6 +43,13 @@
         <selectOption selector="{{AdminProductFormNewAttributeSection.attributeType}}" userInput="{{attributeType}}" stepKey="selectAttributeType"/>
         <click selector="{{AdminProductFormNewAttributeSection.saveAttribute}}" stepKey="saveAttribute"/>
     </actionGroup>
+    <actionGroup name="AdminCreateAttributeFromProductPageWithScope" extends="AdminCreateAttributeFromProductPage" insertAfter="selectAttributeType">
+        <arguments>
+            <argument name="scope" type="string" defaultValue="Store View"/>
+        </arguments>
+        <conditionalClick selector="{{AdminProductFormNewAttributeAdvancedSection.sectionHeader}}" dependentSelector="{{AdminProductFormNewAttributeAdvancedSection.scope}}" visible="false" stepKey="openAttributeAdvancedSection"/>
+        <selectOption selector="{{AdminProductFormNewAttributeAdvancedSection.scope}}" userInput="{{scope}}" stepKey="selectScope"/>
+    </actionGroup>
 
     <actionGroup name="AdminCreateAttributeWithValueWithTwoStoreViesFromProductPage" extends="AdminCreateAttributeFromProductPage">
         <remove keyForRemoval="saveAttribute"/>

app/code/Magento/Catalog/Test/Mftf/Section/AdminCategorySidebarTreeSection.xml

@@ -13,6 +13,8 @@
         <element name="expandAll" type="button" selector=".tree-actions a:last-child"/>
         <element name="categoryTreeRoot" type="text" selector="div.x-tree-root-node>li.x-tree-node:first-of-type>div.x-tree-node-el:first-of-type" timeout="30"/>
         <element name="categoryInTree" type="text" selector="//a/span[contains(text(), '{{name}}')]" parameterized="true" timeout="30"/>
+        <element name="categoryHighlighted" type="text" selector="//ul[@id='ui-id-2']//li//a/span[contains(text(),'{{name}}')]/../.." parameterized="true" timeout="30"/>
+        <element name="categoryNotHighlighted" type="text" selector="ul[id=\'ui-id-2\'] li[class~=\'active\']" timeout="30"/>
         <element name="categoryInTreeUnderRoot" type="text" selector="//li/ul/li[@class='x-tree-node']/div/a/span[contains(text(), '{{name}}')]" parameterized="true"/>
         <element name="lastCreatedCategory" type="block" selector=".x-tree-root-ct li li:last-child" />
         <element name="treeContainer" type="block" selector=".tree-holder" />

app/code/Magento/Catalog/Test/Mftf/Section/AdminProductFormAttributeSection.xml

@@ -25,6 +25,7 @@
     <section name="AdminProductFormNewAttributeAdvancedSection">
         <element name="sectionHeader" type="button" selector="div[data-index='advanced_fieldset']"/>
         <element name="defaultValue" type="textarea" selector="input[name='default_value_text']"/>
+        <element name="scope" type="select" selector="//div[@data-index='advanced_fieldset']//select[@name='is_global']"/>
     </section>
     <section name="AdminProductFormNewAttributeStorefrontSection">
         <element name="sectionHeader" type="button" selector="div[data-index='front_fieldset']"/>