Merge remote-tracking branch 'mainline/develop' into PR_Branch

Author: Olga Kopylova

app/code/Magento/Backend/Block/Menu.php

@@ -210,16 +210,24 @@ protected function _renderItemCssClass($menuItem, $level)
      */
     protected function _renderAnchor($menuItem, $level)
     {
-        return '<a href="' . $menuItem->getUrl() . '" ' . $this->_renderItemAnchorTitle(
-            $menuItem
-        ) . $this->_renderItemOnclickFunction(
-            $menuItem
-        ) . ' class="' . $this->_renderAnchorCssClass(
-            $menuItem,
-            $level
-        ) . '">' . '<span>' . $this->_getAnchorLabel(
-            $menuItem
-        ) . '</span>' . '</a>';
+        if ($level == 1 && $menuItem->getUrl() == '#') {
+            $output = '<strong class="submenu-group-title" role="presentation">'
+                . '<span>' . $this->_getAnchorLabel($menuItem) . '</span>'
+                . '</strong>';
+        } else {
+            $output = '<a href="' . $menuItem->getUrl() . '" ' . $this->_renderItemAnchorTitle(
+                $menuItem
+            ) . $this->_renderItemOnclickFunction(
+                $menuItem
+            ) . ' class="' . $this->_renderAnchorCssClass(
+                $menuItem,
+                $level
+            ) . '">' . '<span>' . $this->_getAnchorLabel(
+                $menuItem
+            ) . '</span>' . '</a>';
+        }
+
+        return $output;
     }
 
     /**
@@ -397,15 +405,16 @@ protected function _columnBrake($items, $limit)
      * @param \Magento\Backend\Model\Menu\Item $menuItem
      * @param int $level
      * @param int $limit
+     * @param $id int
      * @return string HTML code
      */
-    protected function _addSubMenu($menuItem, $level, $limit)
+    protected function _addSubMenu($menuItem, $level, $limit, $id = null)
     {
         $output = '';
         if (!$menuItem->hasChildren()) {
             return $output;
         }
-        $output .= '<div class="submenu">';
+        $output .= '<div class="submenu"' . ($level == 0 && isset($id) ? ' aria-labelledby="' . $id . '"' : '') . '>';
         $colStops = null;
         if ($level == 0 && $limit) {
             $colStops = $this->_columnBrake($menuItem->getChildren(), $limit);
@@ -426,6 +435,7 @@ protected function _addSubMenu($menuItem, $level, $limit)
      * @param int $limit
      * @param array $colBrakes
      * @return string HTML
+     * @SuppressWarnings(PHPMD.NPathComplexity)
      */
     public function renderNavigation($menu, $level = 0, $limit = 0, $colBrakes = [])
     {
@@ -443,18 +453,21 @@ public function renderNavigation($menu, $level = 0, $limit = 0, $colBrakes = [])
                 $output .= '</ul></li><li class="column"><ul role="menu">';
             }
 
+            $id = $this->getJsId($menuItem->getId());
             $output .= '<li ' . $this->getUiId(
                 $menuItem->getId()
             ) . ' class="item-' . $itemClass . ' ' . $this->_renderItemCssClass(
                 $menuItem,
                 $level
-            ) . '" role="menu-item">' . $this->_renderAnchor(
+            ) . ($level == 0 ? '" id="' . $id . '" aria-haspopup="true' : '')
+                . '" role="menu-item">' . $this->_renderAnchor(
                 $menuItem,
                 $level
             ) . $this->_addSubMenu(
                 $menuItem,
                 $level,
-                $limit
+                $limit,
+                $id
             ) . '</li>';
             $itemPosition++;
         }

app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Inventory.php

@@ -5,6 +5,8 @@
  */
 namespace Magento\Catalog\Block\Adminhtml\Product\Edit\Tab;
 
+use Magento\Framework\Api\SimpleDataObjectConverter;
+
 /**
  * Product inventory data
  */
@@ -133,7 +135,7 @@ public function getFieldValue($field)
     {
         $stockItem = $this->getStockItem();
         if ($stockItem->getItemId()) {
-            $method = 'get' . \Magento\Framework\Api\SimpleDataObjectConverter::snakeCaseToUpperCamelCase($field);
+            $method = 'get' . SimpleDataObjectConverter::snakeCaseToUpperCamelCase($field);
             if (method_exists($stockItem, $method)) {
                 return $stockItem->{$method}();
             }
@@ -149,7 +151,7 @@ public function getConfigFieldValue($field)
     {
         $stockItem = $this->getStockItem();
         if ($stockItem->getItemId()) {
-            $method = 'getUseConfig' . \Magento\Framework\Api\SimpleDataObjectConverter::snakeCaseToUpperCamelCase(
+            $method = 'getUseConfig' . SimpleDataObjectConverter::snakeCaseToUpperCamelCase(
                 $field
             );
             if (method_exists($stockItem, $method)) {

app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/action/inventory.phtml

@@ -50,7 +50,7 @@
                                 class="select" disabled="disabled">
                             <option value="1"><?php echo __('Yes') ?></option>
                             <option
-                                value="0"<?php if ($block->getConfigFieldValue('manage_stock') == 0): ?> selected="selected"<?php endif; ?>><?php echo __('No') ?></option>
+                                value="0"<?php if ($block->getFieldValue('manage_stock') == 0): ?> selected="selected"<?php endif; ?>><?php echo __('No') ?></option>
                         </select>
                     </div>
                     <div class="field choice">

app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/tab/inventory.phtml

@@ -24,7 +24,7 @@
     <div class="control">
         <select id="inventory_manage_stock" name="<?php echo $block->getFieldSuffix() ?>[stock_data][manage_stock]" <?php echo $_readonly;?>>
             <option value="1"><?php echo __('Yes') ?></option>
-            <option value="0"<?php if ($block->getConfigFieldValue('manage_stock') == 0): ?> selected="selected"<?php endif; ?>><?php echo __('No') ?></option>
+            <option value="0"<?php if ($block->getFieldValue('manage_stock') == 0): ?> selected="selected"<?php endif; ?>><?php echo __('No') ?></option>
         </select>
         <input type="hidden" id="inventory_manage_stock_default" value="<?php echo $block->getDefaultConfigValue('manage_stock'); ?>">
         <?php $_checked = ($block->getFieldValue('use_config_manage_stock') || $block->IsNew()) ? 'checked="checked"' : '' ?>

app/code/Magento/Catalog/view/adminhtml/templates/product/edit/attribute/search.phtml

@@ -25,7 +25,7 @@
     <ul data-mage-init='{"menu":[]}'>
         <% if (data.items.length) { %>
         <% _.each(data.items, function(value){ %>
-        <li <%- data.optionData(value) %>><a href="#"><%- value.label %></a></li>
+        <li <%= data.optionData(value) %>><a href="#"><%- value.label %></a></li>
         <% }); %>
         <% } else { %><span class="mage-suggest-no-records"><%- data.noRecordsText %></span><% } %>
     </ul>
@@ -50,7 +50,7 @@
                 data: {'template_id': data.id}
             });
         });
-        
+
         $suggest.mage('suggest', <?php echo $this->helper('Magento\Framework\Json\Helper\Data')->jsonEncode($block->getSelectorOptions())?>)
             .on('suggestselect', function (e, ui) {
                 $(this).val('');

app/code/Magento/Cms/Ui/DataProvider/Block/Row/Actions.php

@@ -34,14 +34,18 @@ public function __construct(UrlInterface $urlBuilder)
     /**
      * Get data
      *
-     * @param array $dataRow
-     * @return mixed
+     * @param array $rowData
+     * @param array $rowActionConfig
+     * @return array
      */
-    public function getData(array $dataRow)
+    public function getData(array $rowData, array $rowActionConfig = [])
     {
         return [
             'edit' => [
-                'href' => $this->urlBuilder->getUrl(static::URL_PATH, ['block_id' => $dataRow['block_id']]),
+                'href' => $this->urlBuilder->getUrl(
+                    isset($rowActionConfig['url_path']) ? $rowActionConfig['url_path'] : static::URL_PATH,
+                    ['block_id' => $rowData['block_id']]
+                ),
                 'label' => __('Edit'),
             ]
         ];

app/code/Magento/Cms/Ui/DataProvider/Page/Row/Actions.php

@@ -44,23 +44,27 @@ public function __construct(UrlBuilder $actionUrlBuilder, UrlInterface $urlBuild
     /**
      * Get data
      *
-     * @param array $dataRow
-     * @return mixed
+     * @param array $rowData
+     * @param array $rowActionConfig
+     * @return array
      */
-    public function getData(array $dataRow)
+    public function getData(array $rowData, array $rowActionConfig = [])
     {
         return [
             'edit' => [
-                'href' => $this->urlBuilder->getUrl(static::URL_PATH, ['page_id' => $dataRow['page_id']]),
+                'href' => $this->urlBuilder->getUrl(
+                    isset($rowActionConfig['url_path']) ? $rowActionConfig['url_path'] : static::URL_PATH,
+                    ['page_id' => $rowData['page_id']]
+                ),
                 'label' => __('Edit'),
                 'hidden' => true,
 
             ],
             'preview' => [
                 'href' => $this->actionUrlBuilder->getUrl(
-                    $dataRow['identifier'],
-                    isset($dataRow['_first_store_id']) ? $dataRow['_first_store_id'] : null,
-                    isset($dataRow['store_code']) ? $dataRow['store_code'] : null
+                    $rowData['identifier'],
+                    isset($rowData['_first_store_id']) ? $rowData['_first_store_id'] : null,
+                    isset($rowData['store_code']) ? $rowData['store_code'] : null
                 ),
                 'label' => __('Preview'),
             ]

app/code/Magento/Customer/Block/Address/Edit.php

@@ -106,24 +106,22 @@ protected function _prepareLayout()
         if ($addressId = $this->getRequest()->getParam('id')) {
             try {
                 $this->_address = $this->_addressRepository->getById($addressId);
+                if ($this->_address->getCustomerId() != $this->_customerSession->getCustomerId()) {
+                    $this->_address = null;
+                }
             } catch (NoSuchEntityException $e) {
                 $this->_address = null;
             }
         }
 
         if ($this->_address === null || !$this->_address->getId()) {
             $this->_address = $this->addressDataFactory->create();
-            $this->_address->setPrefix(
-                $this->getCustomer()->getPrefix()
-            )->setFirstname(
-                $this->getCustomer()->getFirstname()
-            )->setMiddlename(
-                $this->getCustomer()->getMiddlename()
-            )->setLastname(
-                $this->getCustomer()->getLastname()
-            )->setSuffix(
-                $this->getCustomer()->getSuffix()
-            );
+            $customer = $this->getCustomer();
+            $this->_address->setPrefix($customer->getPrefix());
+            $this->_address->setFirstname($customer->getFirstname());
+            $this->_address->setMiddlename($customer->getMiddlename());
+            $this->_address->setLastname($customer->getLastname());
+            $this->_address->setSuffix($customer->getSuffix());
         }
 
         $this->pageConfig->getTitle()->set($this->getTitle());