Merge branch 'develop' of https://github.com/magento/magento2ce into MAGETWO-58729

Author: AVoskoboinikov

README.md

@@ -1,5 +1,6 @@
 [![Build Status](https://travis-ci.org/magento/magento2.svg?branch=develop)](https://travis-ci.org/magento/magento2)
 [![Gitter](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/magento/magento2?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge)
+[![Crowdin](https://d322cqt584bo4o.cloudfront.net/magento-2/localized.png)](https://crowdin.com/project/magento-2)
 <h2>Welcome</h2>
 Welcome to Magento 2 installation! We're glad you chose to install Magento 2, a cutting edge, feature-rich eCommerce solution that gets results.
 

app/code/Magento/AdminNotification/view/adminhtml/layout/default.xml

@@ -17,10 +17,10 @@
                    name="notification_window"
                    as="notification_window"
                    acl="Magento_AdminNotification::show_toolbar"
-                   template="notification/window.phtml"/>
+                   template="Magento_AdminNotification::notification/window.phtml"/>
         </referenceContainer>
         <referenceContainer name="header">
-            <block class="Magento\AdminNotification\Block\ToolbarEntry" name="notification.messages" before="user" template="toolbar_entry.phtml"/>
+            <block class="Magento\AdminNotification\Block\ToolbarEntry" name="notification.messages" before="user" template="Magento_AdminNotification::toolbar_entry.phtml"/>
         </referenceContainer>
     </body>
 </page>

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

@@ -49,9 +49,12 @@ public function __construct(
     public function renderAnchor($activeItem, Item $menuItem, $level)
     {
         if ($level == 1 && $menuItem->getUrl() == '#') {
-            $output = '<strong class="submenu-group-title" role="presentation">'
-                . '<span>' . $this->escaper->escapeHtml(__($menuItem->getTitle())) . '</span>'
-                . '</strong>';
+            $output = '';
+            if ($menuItem->hasChildren()) {
+                $output = '<strong class="submenu-group-title" role="presentation">'
+                    . '<span>' . $this->escaper->escapeHtml(__($menuItem->getTitle())) . '</span>'
+                    . '</strong>';
+            }
         } else {
             $target = $menuItem->getTarget() ? ('target=' . $menuItem->getTarget()) : '';
             $output = '<a href="' . $menuItem->getUrl() . '" ' . $target . ' ' . $this->_renderItemAnchorTitle(

app/code/Magento/Backend/Test/Unit/Block/AnchorRendererTest.php

@@ -51,6 +51,9 @@ protected function setUp()
         $this->menuItemMock = $this->getMockBuilder(Item::class)
             ->disableOriginalConstructor()
             ->getMock();
+        $this->menuItemWithoutChildrenMock = $this->getMockBuilder(Item::class)
+            ->disableOriginalConstructor()
+            ->getMock();
         $this->menuItemCheckerMock = $this->getMockBuilder(MenuItemChecker::class)
             ->disableOriginalConstructor()
             ->getMock();
@@ -74,6 +77,7 @@ public function testRenderAnchorLevelIsOne()
         $html =  'Test html';
         $this->menuItemMock->expects($this->once())->method('getUrl')->willReturn('#');
         $this->menuItemMock->expects($this->once())->method('getTitle')->willReturn($title);
+        $this->menuItemMock->expects($this->once())->method('hasChildren')->willReturn(true);
         $this->escaperMock->expects($this->once())->method('escapeHtml')->with(__($title))->willReturn($html);
 
         $expected =  '<strong class="submenu-group-title" role="presentation">'
@@ -86,6 +90,19 @@ public function testRenderAnchorLevelIsOne()
         );
     }
 
+    public function testRenderAnchorWithoutChildrenAndLevelIsOne()
+    {
+        $this->menuItemWithoutChildrenMock->expects($this->once())->method('getUrl')->willReturn('#');
+        $this->menuItemWithoutChildrenMock->expects($this->once())->method('hasChildren')->willReturn(false);
+
+        $expected =  '';
+
+        $this->assertEquals(
+            $expected,
+            $this->anchorRenderer->renderAnchor($this->activeMenuItemMock, $this->menuItemWithoutChildrenMock, 1)
+        );
+    }
+
     /**
      * @param bool $hasTarget
      * @dataProvider targetDataProvider

app/code/Magento/Backend/composer.json

@@ -7,7 +7,6 @@
         "magento/module-directory": "100.2.*",
         "magento/module-developer": "100.2.*",
         "magento/module-eav": "100.2.*",
-        "magento/module-theme": "100.2.*",
         "magento/module-reports": "100.2.*",
         "magento/module-sales": "100.2.*",
         "magento/module-quote": "100.2.*",
@@ -21,6 +20,9 @@
         "magento/module-config": "100.2.*",
         "magento/framework": "100.2.*"
     },
+    "suggest": {
+        "magento/module-theme": "100.2.*"
+    },
     "type": "magento2-module",
     "version": "100.2.0-dev",
     "license": [

app/code/Magento/Backend/etc/di.xml

@@ -26,11 +26,6 @@
             </argument>
         </arguments>
     </type>
-    <type name="Magento\Backend\App\Router">
-        <arguments>
-            <argument name="routerId" xsi:type="string">admin</argument>
-        </arguments>
-    </type>
     <type name="Magento\Backend\Model\Menu\Config">
         <arguments>
             <argument name="menuDirector" xsi:type="object">Magento\Backend\Model\Menu\Director\Director</argument>

app/code/Magento/Backend/view/adminhtml/layout/adminhtml_auth_login.xml

@@ -9,10 +9,10 @@
     <update handle="admin_login" />
     <body>
         <referenceContainer name="login.content">
-            <block class="Magento\Backend\Block\Template" name="admin.login" template="admin/login.phtml">
+            <block class="Magento\Backend\Block\Template" name="admin.login" template="Magento_Backend::admin/login.phtml">
                 <container name="form.additional.info" label="Form Additional Info"/>
                 <container name="form.buttons" label="Form Buttons">
-                    <block class="Magento\Backend\Block\Template" name="adminhtml_auth_login_buttons" template="admin/login_buttons.phtml"/>
+                    <block class="Magento\Backend\Block\Template" name="adminhtml_auth_login_buttons" template="Magento_Backend::admin/login_buttons.phtml"/>
                 </container>
             </block>
         </referenceContainer>

app/code/Magento/Backend/view/adminhtml/layout/adminhtml_denied.xml

@@ -8,7 +8,7 @@
 <page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" layout="admin-1column" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
     <body>
         <referenceContainer name="content">
-            <block class="Magento\Backend\Block\Denied" name="content.denied" template="admin/access_denied.phtml"/>
+            <block class="Magento\Backend\Block\Denied" name="content.denied" template="Magento_Backend::admin/access_denied.phtml"/>
         </referenceContainer>
     </body>
 </page>

app/code/Magento/Backend/view/adminhtml/layout/default.xml

@@ -18,7 +18,7 @@
         <attribute name="id" value="html-body"/>
         <block name="require.js" class="Magento\Backend\Block\Page\RequireJs" template="Magento_Backend::page/js/require_js.phtml"/>
         <referenceContainer name="global.notices">
-            <block class="Magento\Backend\Block\Page\Notices" name="global_notices" as="global_notices" template="page/notices.phtml"/>
+            <block class="Magento\Backend\Block\Page\Notices" name="global_notices" as="global_notices" template="Magento_Backend::page/notices.phtml"/>
         </referenceContainer>
         <referenceContainer name="header">
             <block class="Magento\Backend\Block\Page\Header" name="logo" before="-">
@@ -45,7 +45,7 @@
             <block class="Magento\Backend\Block\Admin\Formkey" name="formkey" as="formkey" template="Magento_Backend::admin/formkey.phtml"/>
         </referenceContainer>
         <referenceContainer name="main.top">
-            <block class="Magento\Theme\Block\Html\Title" name="page.title" template="title.phtml"/>
+            <block class="Magento\Theme\Block\Html\Title" name="page.title" template="Magento_Theme::title.phtml"/>
         </referenceContainer>
         <referenceContainer name="page.messages">
             <block class="Magento\Framework\View\Element\Messages" name="messages" as="messages"/>

app/code/Magento/Braintree/view/frontend/layout/braintree_paypal_review.xml

@@ -20,11 +20,11 @@
         </referenceContainer>
         <referenceContainer name="content">
             <block class="Magento\Braintree\Block\Paypal\Checkout\Review" name="braintree.paypal.review" template="Magento_Paypal::express/review.phtml">
-                <block class="Magento\Paypal\Block\Express\Review" name="express.review.shipping.method" as="shipping_method" template="express/review/shipping/method.phtml"/>
+                <block class="Magento\Paypal\Block\Express\Review" name="express.review.shipping.method" as="shipping_method" template="Magento_Paypal::express/review/shipping/method.phtml"/>
                 <block class="Magento\Framework\View\Element\Text\ListText" name="paypal.additional.actions">
                     <block class="Magento\Checkout\Block\Cart\Coupon" name="paypal.cart.coupon" as="coupon" template="Magento_Checkout::cart/coupon.phtml"/>
                 </block>
-                <block class="Magento\Paypal\Block\Express\Review\Details" name="paypal.express.review.details" as="details" template="express/review/details.phtml">
+                <block class="Magento\Paypal\Block\Express\Review\Details" name="paypal.express.review.details" as="details" template="Magento_Paypal::express/review/details.phtml">
                     <block class="Magento\Framework\View\Element\RendererList" name="checkout.onepage.review.item.renderers" as="renderer.list"/>
                     <block class="Magento\Checkout\Block\Cart\Totals" name="paypal.express.review.details.totals" as="totals" template="Magento_Paypal::checkout/onepage/review/totals.phtml"/>
                 </block>