Skip to content

Commit 6658bda

Browse files
author
Yurii Torbyk
committed
Merge remote-tracking branch 'origin/MAGETWO-26762' into MAGETWO-34993
Conflicts: app/code/Magento/Backend/Controller/Adminhtml/System/Account/Save.php
2 parents a5f892e + 48d28e4 commit 6658bda

File tree

250 files changed

+2275
-1605
lines changed

Some content is hidden

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

250 files changed

+2275
-1605
lines changed

‎.htaccess

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -170,12 +170,6 @@
170170

171171
</IfModule>
172172

173-
############################################
174-
## By default allow all access
175-
176-
Order allow,deny
177-
Allow from all
178-
179173
###########################################
180174
## Deny access to release notes to prevent disclosure of the installed Magento version
181175

‎.htaccess.sample

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -167,12 +167,6 @@
167167

168168
</IfModule>
169169

170-
############################################
171-
## By default allow all access
172-
173-
Order allow,deny
174-
Allow from all
175-
176170
###########################################
177171
## Deny access to release notes to prevent disclosure of the installed Magento version
178172

‎app/code/Magento/Backend/App/Action/Context.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,6 @@ class Context extends \Magento\Framework\App\Action\Context
6969
* @param \Magento\Backend\Model\UrlInterface $backendUrl
7070
* @param \Magento\Framework\Data\Form\FormKey\Validator $formKeyValidator
7171
* @param \Magento\Framework\Locale\ResolverInterface $localeResolver
72-
* @param \Magento\Backend\Model\View\Result\RedirectFactory $resultRedirectFactory
7372
* @param bool $canUseBaseUrl
7473
* @SuppressWarnings(PHPMD.ExcessiveParameterList)
7574
*/
@@ -91,7 +90,6 @@ public function __construct(
9190
\Magento\Backend\Model\UrlInterface $backendUrl,
9291
\Magento\Framework\Data\Form\FormKey\Validator $formKeyValidator,
9392
\Magento\Framework\Locale\ResolverInterface $localeResolver,
94-
\Magento\Backend\Model\View\Result\RedirectFactory $resultRedirectFactory,
9593
$canUseBaseUrl = false
9694
) {
9795
parent::__construct(

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

Lines changed: 27 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -210,16 +210,24 @@ protected function _renderItemCssClass($menuItem, $level)
210210
*/
211211
protected function _renderAnchor($menuItem, $level)
212212
{
213-
return '<a href="' . $menuItem->getUrl() . '" ' . $this->_renderItemAnchorTitle(
214-
$menuItem
215-
) . $this->_renderItemOnclickFunction(
216-
$menuItem
217-
) . ' class="' . $this->_renderAnchorCssClass(
218-
$menuItem,
219-
$level
220-
) . '">' . '<span>' . $this->_getAnchorLabel(
221-
$menuItem
222-
) . '</span>' . '</a>';
213+
if ($level == 1 && $menuItem->getUrl() == '#') {
214+
$output = '<strong class="submenu-group-title" role="presentation">'
215+
. '<span>' . $this->_getAnchorLabel($menuItem) . '</span>'
216+
. '</strong>';
217+
} else {
218+
$output = '<a href="' . $menuItem->getUrl() . '" ' . $this->_renderItemAnchorTitle(
219+
$menuItem
220+
) . $this->_renderItemOnclickFunction(
221+
$menuItem
222+
) . ' class="' . $this->_renderAnchorCssClass(
223+
$menuItem,
224+
$level
225+
) . '">' . '<span>' . $this->_getAnchorLabel(
226+
$menuItem
227+
) . '</span>' . '</a>';
228+
}
229+
230+
return $output;
223231
}
224232

225233
/**
@@ -397,15 +405,16 @@ protected function _columnBrake($items, $limit)
397405
* @param \Magento\Backend\Model\Menu\Item $menuItem
398406
* @param int $level
399407
* @param int $limit
408+
* @param $id int
400409
* @return string HTML code
401410
*/
402-
protected function _addSubMenu($menuItem, $level, $limit)
411+
protected function _addSubMenu($menuItem, $level, $limit, $id = null)
403412
{
404413
$output = '';
405414
if (!$menuItem->hasChildren()) {
406415
return $output;
407416
}
408-
$output .= '<div class="submenu">';
417+
$output .= '<div class="submenu"' . ($level == 0 && isset($id) ? ' aria-labelledby="' . $id . '"' : '') . '>';
409418
$colStops = null;
410419
if ($level == 0 && $limit) {
411420
$colStops = $this->_columnBrake($menuItem->getChildren(), $limit);
@@ -426,6 +435,7 @@ protected function _addSubMenu($menuItem, $level, $limit)
426435
* @param int $limit
427436
* @param array $colBrakes
428437
* @return string HTML
438+
* @SuppressWarnings(PHPMD.NPathComplexity)
429439
*/
430440
public function renderNavigation($menu, $level = 0, $limit = 0, $colBrakes = [])
431441
{
@@ -443,18 +453,21 @@ public function renderNavigation($menu, $level = 0, $limit = 0, $colBrakes = [])
443453
$output .= '</ul></li><li class="column"><ul role="menu">';
444454
}
445455

456+
$id = $this->getJsId($menuItem->getId());
446457
$output .= '<li ' . $this->getUiId(
447458
$menuItem->getId()
448459
) . ' class="item-' . $itemClass . ' ' . $this->_renderItemCssClass(
449460
$menuItem,
450461
$level
451-
) . '" role="menu-item">' . $this->_renderAnchor(
462+
) . ($level == 0 ? '" id="' . $id . '" aria-haspopup="true' : '')
463+
. '" role="menu-item">' . $this->_renderAnchor(
452464
$menuItem,
453465
$level
454466
) . $this->_addSubMenu(
455467
$menuItem,
456468
$level,
457-
$limit
469+
$limit,
470+
$id
458471
) . '</li>';
459472
$itemPosition++;
460473
}

‎app/code/Magento/Backend/Controller/Adminhtml/Auth/Login.php

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -13,25 +13,17 @@ class Login extends \Magento\Backend\Controller\Adminhtml\Auth
1313
*/
1414
protected $resultPageFactory;
1515

16-
/**
17-
* @var \Magento\Backend\Model\View\Result\RedirectFactory
18-
*/
19-
protected $resultRedirectFactory;
20-
2116
/**
2217
* Constructor
2318
*
2419
* @param \Magento\Backend\App\Action\Context $context
2520
* @param \Magento\Framework\View\Result\PageFactory $resultPageFactory
26-
* @param \Magento\Backend\Model\View\Result\RedirectFactory $resultRedirectFactory
2721
*/
2822
public function __construct(
2923
\Magento\Backend\App\Action\Context $context,
30-
\Magento\Framework\View\Result\PageFactory $resultPageFactory,
31-
\Magento\Backend\Model\View\Result\RedirectFactory $resultRedirectFactory
24+
\Magento\Framework\View\Result\PageFactory $resultPageFactory
3225
) {
3326
$this->resultPageFactory = $resultPageFactory;
34-
$this->resultRedirectFactory = $resultRedirectFactory;
3527
parent::__construct($context);
3628
}
3729

‎app/code/Magento/Backend/Controller/Adminhtml/Auth/Logout.php

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -8,21 +8,13 @@
88

99
class Logout extends \Magento\Backend\Controller\Adminhtml\Auth
1010
{
11-
/**
12-
* @var \Magento\Backend\Model\View\Result\RedirectFactory
13-
*/
14-
protected $resultRedirectFactory;
15-
1611
/**
1712
* @param \Magento\Backend\App\Action\Context $context
18-
* @param \Magento\Backend\Model\View\Result\RedirectFactory $resultRedirectFactory
1913
*/
2014
public function __construct(
21-
\Magento\Backend\App\Action\Context $context,
22-
\Magento\Backend\Model\View\Result\RedirectFactory $resultRedirectFactory
15+
\Magento\Backend\App\Action\Context $context
2316
) {
2417
parent::__construct($context);
25-
$this->resultRedirectFactory = $resultRedirectFactory;
2618
}
2719

2820
/**

‎app/code/Magento/Backend/Controller/Adminhtml/Cache.php

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,6 @@ class Cache extends Action
2525
*/
2626
protected $_cacheFrontendPool;
2727

28-
/**
29-
* @var \Magento\Backend\Model\View\Result\RedirectFactory
30-
*/
31-
protected $resultRedirectFactory;
32-
3328
/**
3429
* @var \Magento\Framework\View\Result\PageFactory
3530
*/
@@ -40,22 +35,19 @@ class Cache extends Action
4035
* @param \Magento\Framework\App\Cache\TypeListInterface $cacheTypeList
4136
* @param \Magento\Framework\App\Cache\StateInterface $cacheState
4237
* @param \Magento\Framework\App\Cache\Frontend\Pool $cacheFrontendPool
43-
* @param \Magento\Backend\Model\View\Result\RedirectFactory $resultRedirectFactory
4438
* @param \Magento\Framework\View\Result\PageFactory $resultPageFactory
4539
*/
4640
public function __construct(
4741
Action\Context $context,
4842
\Magento\Framework\App\Cache\TypeListInterface $cacheTypeList,
4943
\Magento\Framework\App\Cache\StateInterface $cacheState,
5044
\Magento\Framework\App\Cache\Frontend\Pool $cacheFrontendPool,
51-
\Magento\Backend\Model\View\Result\RedirectFactory $resultRedirectFactory,
5245
\Magento\Framework\View\Result\PageFactory $resultPageFactory
5346
) {
5447
parent::__construct($context);
5548
$this->_cacheTypeList = $cacheTypeList;
5649
$this->_cacheState = $cacheState;
5750
$this->_cacheFrontendPool = $cacheFrontendPool;
58-
$this->resultRedirectFactory = $resultRedirectFactory;
5951
$this->resultPageFactory = $resultPageFactory;
6052
}
6153

‎app/code/Magento/Backend/Controller/Adminhtml/Dashboard/RefreshStatistics.php

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,18 +11,16 @@ class RefreshStatistics extends \Magento\Reports\Controller\Adminhtml\Report\Sta
1111
/**
1212
* @param \Magento\Backend\App\Action\Context $context
1313
* @param \Magento\Framework\Stdlib\DateTime\Filter\Date $dateFilter
14-
* @param \Magento\Backend\Model\View\Result\RedirectFactory $resultRedirectFactory
1514
* @param array $reportTypes
1615
* @param \Psr\Log\LoggerInterface $logger
1716
*/
1817
public function __construct(
1918
\Magento\Backend\App\Action\Context $context,
2019
\Magento\Framework\Stdlib\DateTime\Filter\Date $dateFilter,
21-
\Magento\Backend\Model\View\Result\RedirectFactory $resultRedirectFactory,
2220
array $reportTypes,
2321
\Psr\Log\LoggerInterface $logger
2422
) {
25-
parent::__construct($context, $dateFilter, $resultRedirectFactory, $reportTypes);
23+
parent::__construct($context, $dateFilter, $reportTypes);
2624
$this->logger = $logger;
2725
}
2826

‎app/code/Magento/Backend/Controller/Adminhtml/Denied.php

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,28 +8,20 @@
88

99
class Denied extends \Magento\Backend\App\Action
1010
{
11-
/**
12-
* @var \Magento\Backend\Model\View\Result\RedirectFactory
13-
*/
14-
protected $resultRedirectFactory;
15-
1611
/**
1712
* @var \Magento\Framework\View\Result\PageFactory
1813
*/
1914
protected $resultPageFactory;
2015

2116
/**
2217
* @param \Magento\Backend\App\Action\Context $context
23-
* @param \Magento\Backend\Model\View\Result\RedirectFactory $resultRedirectFactory
2418
* @param \Magento\Framework\View\Result\PageFactory $resultPageFactory
2519
*/
2620
public function __construct(
2721
\Magento\Backend\App\Action\Context $context,
28-
\Magento\Backend\Model\View\Result\RedirectFactory $resultRedirectFactory,
2922
\Magento\Framework\View\Result\PageFactory $resultPageFactory
3023
) {
3124
parent::__construct($context);
32-
$this->resultRedirectFactory = $resultRedirectFactory;
3325
$this->resultPageFactory = $resultPageFactory;
3426
}
3527

‎app/code/Magento/Backend/Controller/Adminhtml/Index/ChangeLocale.php

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -8,22 +8,14 @@
88

99
class ChangeLocale extends \Magento\Backend\Controller\Adminhtml\Index
1010
{
11-
/**
12-
* @var \Magento\Backend\Model\View\Result\RedirectFactory
13-
*/
14-
protected $resultRedirectFactory;
15-
1611
/**
1712
* Constructor
1813
*
1914
* @param \Magento\Backend\App\Action\Context $context
20-
* @param \Magento\Backend\Model\View\Result\RedirectFactory $resultRedirectFactory
2115
*/
2216
public function __construct(
23-
\Magento\Backend\App\Action\Context $context,
24-
\Magento\Backend\Model\View\Result\RedirectFactory $resultRedirectFactory
17+
\Magento\Backend\App\Action\Context $context
2518
) {
26-
$this->resultRedirectFactory = $resultRedirectFactory;
2719
parent::__construct($context);
2820
}
2921

0 commit comments

Comments
 (0)