Skip to content

Commit ae83d13

Browse files
vrannvrann
committed
Merge remote-tracking branch 'mainline/develop' into MAGETWO-66655-PR-8928
2 parents 7b1c095 + 3646356 commit ae83d13

File tree

414 files changed

+4088
-2265
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

414 files changed

+4088
-2265
lines changed

‎PULL_REQUEST_TEMPLATE.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
<!--- Provide a description of the changes proposed in the pull request -->
55

66
### Fixed Issues (if relevant)
7-
<!--- Provide a list of fixed issues in the format magento/magetno2#<issue_number>, if relevant -->
8-
1. magento/magetno2#<issue_number>: Issue title
7+
<!--- Provide a list of fixed issues in the format magento/magento2#<issue_number>, if relevant -->
8+
1. magento/magento2#<issue_number>: Issue title
99
2. ...
1010

1111
### Manual testing scenarios

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@
1717
name="notification_window"
1818
as="notification_window"
1919
acl="Magento_AdminNotification::show_toolbar"
20-
template="notification/window.phtml"/>
20+
template="Magento_AdminNotification::notification/window.phtml"/>
2121
</referenceContainer>
2222
<referenceContainer name="header">
23-
<block class="Magento\AdminNotification\Block\ToolbarEntry" name="notification.messages" before="user" template="toolbar_entry.phtml"/>
23+
<block class="Magento\AdminNotification\Block\ToolbarEntry" name="notification.messages" before="user" template="Magento_AdminNotification::toolbar_entry.phtml"/>
2424
</referenceContainer>
2525
</body>
2626
</page>

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

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,9 +49,12 @@ public function __construct(
4949
public function renderAnchor($activeItem, Item $menuItem, $level)
5050
{
5151
if ($level == 1 && $menuItem->getUrl() == '#') {
52-
$output = '<strong class="submenu-group-title" role="presentation">'
53-
. '<span>' . $this->escaper->escapeHtml(__($menuItem->getTitle())) . '</span>'
54-
. '</strong>';
52+
$output = '';
53+
if ($menuItem->hasChildren()) {
54+
$output = '<strong class="submenu-group-title" role="presentation">'
55+
. '<span>' . $this->escaper->escapeHtml(__($menuItem->getTitle())) . '</span>'
56+
. '</strong>';
57+
}
5558
} else {
5659
$target = $menuItem->getTarget() ? ('target=' . $menuItem->getTarget()) : '';
5760
$output = '<a href="' . $menuItem->getUrl() . '" ' . $target . ' ' . $this->_renderItemAnchorTitle(

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

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,9 @@ protected function setUp()
5151
$this->menuItemMock = $this->getMockBuilder(Item::class)
5252
->disableOriginalConstructor()
5353
->getMock();
54+
$this->menuItemWithoutChildrenMock = $this->getMockBuilder(Item::class)
55+
->disableOriginalConstructor()
56+
->getMock();
5457
$this->menuItemCheckerMock = $this->getMockBuilder(MenuItemChecker::class)
5558
->disableOriginalConstructor()
5659
->getMock();
@@ -74,6 +77,7 @@ public function testRenderAnchorLevelIsOne()
7477
$html = 'Test html';
7578
$this->menuItemMock->expects($this->once())->method('getUrl')->willReturn('#');
7679
$this->menuItemMock->expects($this->once())->method('getTitle')->willReturn($title);
80+
$this->menuItemMock->expects($this->once())->method('hasChildren')->willReturn(true);
7781
$this->escaperMock->expects($this->once())->method('escapeHtml')->with(__($title))->willReturn($html);
7882

7983
$expected = '<strong class="submenu-group-title" role="presentation">'
@@ -86,6 +90,19 @@ public function testRenderAnchorLevelIsOne()
8690
);
8791
}
8892

93+
public function testRenderAnchorWithoutChildrenAndLevelIsOne()
94+
{
95+
$this->menuItemWithoutChildrenMock->expects($this->once())->method('getUrl')->willReturn('#');
96+
$this->menuItemWithoutChildrenMock->expects($this->once())->method('hasChildren')->willReturn(false);
97+
98+
$expected = '';
99+
100+
$this->assertEquals(
101+
$expected,
102+
$this->anchorRenderer->renderAnchor($this->activeMenuItemMock, $this->menuItemWithoutChildrenMock, 1)
103+
);
104+
}
105+
89106
/**
90107
* @param bool $hasTarget
91108
* @dataProvider targetDataProvider

‎app/code/Magento/Backend/composer.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
"magento/module-directory": "100.2.*",
88
"magento/module-developer": "100.2.*",
99
"magento/module-eav": "100.2.*",
10-
"magento/module-theme": "100.2.*",
1110
"magento/module-reports": "100.2.*",
1211
"magento/module-sales": "100.2.*",
1312
"magento/module-quote": "100.2.*",
@@ -21,6 +20,9 @@
2120
"magento/module-config": "100.2.*",
2221
"magento/framework": "100.2.*"
2322
},
23+
"suggest": {
24+
"magento/module-theme": "100.2.*"
25+
},
2426
"type": "magento2-module",
2527
"version": "100.2.0-dev",
2628
"license": [

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@
99
<update handle="admin_login" />
1010
<body>
1111
<referenceContainer name="login.content">
12-
<block class="Magento\Backend\Block\Template" name="admin.login" template="admin/login.phtml">
12+
<block class="Magento\Backend\Block\Template" name="admin.login" template="Magento_Backend::admin/login.phtml">
1313
<container name="form.additional.info" label="Form Additional Info"/>
1414
<container name="form.buttons" label="Form Buttons">
15-
<block class="Magento\Backend\Block\Template" name="adminhtml_auth_login_buttons" template="admin/login_buttons.phtml"/>
15+
<block class="Magento\Backend\Block\Template" name="adminhtml_auth_login_buttons" template="Magento_Backend::admin/login_buttons.phtml"/>
1616
</container>
1717
</block>
1818
</referenceContainer>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" layout="admin-1column" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
99
<body>
1010
<referenceContainer name="content">
11-
<block class="Magento\Backend\Block\Denied" name="content.denied" template="admin/access_denied.phtml"/>
11+
<block class="Magento\Backend\Block\Denied" name="content.denied" template="Magento_Backend::admin/access_denied.phtml"/>
1212
</referenceContainer>
1313
</body>
1414
</page>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
<attribute name="id" value="html-body"/>
1919
<block name="require.js" class="Magento\Backend\Block\Page\RequireJs" template="Magento_Backend::page/js/require_js.phtml"/>
2020
<referenceContainer name="global.notices">
21-
<block class="Magento\Backend\Block\Page\Notices" name="global_notices" as="global_notices" template="page/notices.phtml"/>
21+
<block class="Magento\Backend\Block\Page\Notices" name="global_notices" as="global_notices" template="Magento_Backend::page/notices.phtml"/>
2222
</referenceContainer>
2323
<referenceContainer name="header">
2424
<block class="Magento\Backend\Block\Page\Header" name="logo" before="-">
@@ -45,7 +45,7 @@
4545
<block class="Magento\Backend\Block\Admin\Formkey" name="formkey" as="formkey" template="Magento_Backend::admin/formkey.phtml"/>
4646
</referenceContainer>
4747
<referenceContainer name="main.top">
48-
<block class="Magento\Theme\Block\Html\Title" name="page.title" template="title.phtml"/>
48+
<block class="Magento\Theme\Block\Html\Title" name="page.title" template="Magento_Theme::title.phtml"/>
4949
</referenceContainer>
5050
<referenceContainer name="page.messages">
5151
<block class="Magento\Framework\View\Element\Messages" name="messages" as="messages"/>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,11 @@
2020
</referenceContainer>
2121
<referenceContainer name="content">
2222
<block class="Magento\Braintree\Block\Paypal\Checkout\Review" name="braintree.paypal.review" template="Magento_Paypal::express/review.phtml">
23-
<block class="Magento\Paypal\Block\Express\Review" name="express.review.shipping.method" as="shipping_method" template="express/review/shipping/method.phtml"/>
23+
<block class="Magento\Paypal\Block\Express\Review" name="express.review.shipping.method" as="shipping_method" template="Magento_Paypal::express/review/shipping/method.phtml"/>
2424
<block class="Magento\Framework\View\Element\Text\ListText" name="paypal.additional.actions">
2525
<block class="Magento\Checkout\Block\Cart\Coupon" name="paypal.cart.coupon" as="coupon" template="Magento_Checkout::cart/coupon.phtml"/>
2626
</block>
27-
<block class="Magento\Paypal\Block\Express\Review\Details" name="paypal.express.review.details" as="details" template="express/review/details.phtml">
27+
<block class="Magento\Paypal\Block\Express\Review\Details" name="paypal.express.review.details" as="details" template="Magento_Paypal::express/review/details.phtml">
2828
<block class="Magento\Framework\View\Element\RendererList" name="checkout.onepage.review.item.renderers" as="renderer.list"/>
2929
<block class="Magento\Checkout\Block\Cart\Totals" name="paypal.express.review.details.totals" as="totals" template="Magento_Paypal::checkout/onepage/review/totals.phtml"/>
3030
</block>

‎app/code/Magento/Braintree/view/frontend/layout/vault_cards_listaction.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<block class="Magento\Braintree\Block\Customer\CardRenderer" name="braintree.card.renderer" template="Magento_Vault::customer_account/credit_card.phtml"/>
1313
</referenceBlock>
1414
<referenceBlock name="vault.token.list">
15-
<block class="Magento\Braintree\Block\Customer\PayPal\VaultTokenRenderer" name="braintree_paypal.token.renderer" template="paypal/vault_token.phtml"/>
15+
<block class="Magento\Braintree\Block\Customer\PayPal\VaultTokenRenderer" name="braintree_paypal.token.renderer" template="Magento_Braintree::paypal/vault_token.phtml"/>
1616
</referenceBlock>
1717
</referenceContainer>
1818
</body>

0 commit comments

Comments
 (0)