Skip to content

Commit 4350971

Browse files
author
Oleksandr Iegorov
committed
Merge branch '2.3-develop' of https://github.com/magento/magento2ce into MAGETWO-99941
2 parents a52d069 + 6801e95 commit 4350971

File tree

250 files changed

+4543
-1534
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

+4543
-1534
lines changed

‎app/code/Magento/Analytics/Model/ReportXml/ModuleIterator.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
*/
66
namespace Magento\Analytics\Model\ReportXml;
77

8-
use Magento\Framework\Module\Manager as ModuleManager;
8+
use \Magento\Framework\Module\ModuleManagerInterface as ModuleManager;
99

1010
/**
1111
* Iterator for ReportXml modules

‎app/code/Magento/Analytics/Test/Unit/Model/ReportXml/ModuleIteratorTest.php

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,12 @@
77
namespace Magento\Analytics\Test\Unit\Model\ReportXml;
88

99
use Magento\Analytics\Model\ReportXml\ModuleIterator;
10-
use Magento\Framework\Module\Manager as ModuleManager;
10+
use \Magento\Framework\Module\ModuleManagerInterface as ModuleManager;
1111
use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
1212

13+
/**
14+
* Module iterator test.
15+
*/
1316
class ModuleIteratorTest extends \PHPUnit\Framework\TestCase
1417
{
1518
/**

‎app/code/Magento/Backend/Block/Dashboard/Orders/Grid.php

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,21 +19,21 @@ class Grid extends \Magento\Backend\Block\Dashboard\Grid
1919
protected $_collectionFactory;
2020

2121
/**
22-
* @var \Magento\Framework\Module\Manager
22+
* @var \Magento\Framework\Module\ModuleManagerInterface
2323
*/
2424
protected $_moduleManager;
2525

2626
/**
2727
* @param \Magento\Backend\Block\Template\Context $context
2828
* @param \Magento\Backend\Helper\Data $backendHelper
29-
* @param \Magento\Framework\Module\Manager $moduleManager
29+
* @param \Magento\Framework\Module\ModuleManagerInterface $moduleManager
3030
* @param \Magento\Reports\Model\ResourceModel\Order\CollectionFactory $collectionFactory
3131
* @param array $data
3232
*/
3333
public function __construct(
3434
\Magento\Backend\Block\Template\Context $context,
3535
\Magento\Backend\Helper\Data $backendHelper,
36-
\Magento\Framework\Module\Manager $moduleManager,
36+
\Magento\Framework\Module\ModuleManagerInterface $moduleManager,
3737
\Magento\Reports\Model\ResourceModel\Order\CollectionFactory $collectionFactory,
3838
array $data = []
3939
) {
@@ -43,6 +43,8 @@ public function __construct(
4343
}
4444

4545
/**
46+
* Construct.
47+
*
4648
* @return void
4749
*/
4850
protected function _construct()
@@ -52,6 +54,8 @@ protected function _construct()
5254
}
5355

5456
/**
57+
* Prepare collection.
58+
*
5559
* @return $this
5660
*/
5761
protected function _prepareCollection()
@@ -110,6 +114,8 @@ protected function _preparePage()
110114
}
111115

112116
/**
117+
* Prepare columns.
118+
*
113119
* @return $this
114120
*/
115121
protected function _prepareColumns()
@@ -129,7 +135,9 @@ protected function _prepareColumns()
129135
]
130136
);
131137

132-
$baseCurrencyCode = $this->_storeManager->getStore((int)$this->getParam('store'))->getBaseCurrencyCode();
138+
$baseCurrencyCode = $this->_storeManager->getStore(
139+
(int)$this->getParam('store')
140+
)->getBaseCurrencyCode();
133141

134142
$this->addColumn(
135143
'total',
@@ -149,7 +157,7 @@ protected function _prepareColumns()
149157
}
150158

151159
/**
152-
* {@inheritdoc}
160+
* @inheritdoc
153161
*/
154162
public function getRowUrl($row)
155163
{

‎app/code/Magento/Backend/Block/Dashboard/Sales.php

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,27 +18,29 @@ class Sales extends \Magento\Backend\Block\Dashboard\Bar
1818
protected $_template = 'Magento_Backend::dashboard/salebar.phtml';
1919

2020
/**
21-
* @var \Magento\Framework\Module\Manager
21+
* @var \Magento\Framework\Module\ModuleManagerInterface
2222
*/
2323
protected $_moduleManager;
2424

2525
/**
2626
* @param \Magento\Backend\Block\Template\Context $context
2727
* @param \Magento\Reports\Model\ResourceModel\Order\CollectionFactory $collectionFactory
28-
* @param \Magento\Framework\Module\Manager $moduleManager
28+
* @param \Magento\Framework\Module\ModuleManagerInterface $moduleManager
2929
* @param array $data
3030
*/
3131
public function __construct(
3232
\Magento\Backend\Block\Template\Context $context,
3333
\Magento\Reports\Model\ResourceModel\Order\CollectionFactory $collectionFactory,
34-
\Magento\Framework\Module\Manager $moduleManager,
34+
\Magento\Framework\Module\ModuleManagerInterface $moduleManager,
3535
array $data = []
3636
) {
3737
$this->_moduleManager = $moduleManager;
3838
parent::__construct($context, $collectionFactory, $data);
3939
}
4040

4141
/**
42+
* Prepare layout.
43+
*
4244
* @return $this|void
4345
*/
4446
protected function _prepareLayout()

‎app/code/Magento/Backend/Block/Dashboard/Tab/Products/Ordered.php

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,21 +19,21 @@ class Ordered extends \Magento\Backend\Block\Dashboard\Grid
1919
protected $_collectionFactory;
2020

2121
/**
22-
* @var \Magento\Framework\Module\Manager
22+
* @var \Magento\Framework\Module\ModuleManagerInterface
2323
*/
2424
protected $_moduleManager;
2525

2626
/**
2727
* @param \Magento\Backend\Block\Template\Context $context
2828
* @param \Magento\Backend\Helper\Data $backendHelper
29-
* @param \Magento\Framework\Module\Manager $moduleManager
29+
* @param \Magento\Framework\Module\ModuleManagerInterface $moduleManager
3030
* @param \Magento\Sales\Model\ResourceModel\Report\Bestsellers\CollectionFactory $collectionFactory
3131
* @param array $data
3232
*/
3333
public function __construct(
3434
\Magento\Backend\Block\Template\Context $context,
3535
\Magento\Backend\Helper\Data $backendHelper,
36-
\Magento\Framework\Module\Manager $moduleManager,
36+
\Magento\Framework\Module\ModuleManagerInterface $moduleManager,
3737
\Magento\Sales\Model\ResourceModel\Report\Bestsellers\CollectionFactory $collectionFactory,
3838
array $data = []
3939
) {
@@ -43,6 +43,8 @@ public function __construct(
4343
}
4444

4545
/**
46+
* Construct.
47+
*
4648
* @return void
4749
*/
4850
protected function _construct()
@@ -52,7 +54,7 @@ protected function _construct()
5254
}
5355

5456
/**
55-
* {@inheritdoc}
57+
* @inheritdoc
5658
*/
5759
protected function _prepareCollection()
5860
{
@@ -81,7 +83,7 @@ protected function _prepareCollection()
8183
}
8284

8385
/**
84-
* {@inheritdoc}
86+
* @inheritdoc
8587
*/
8688
protected function _prepareColumns()
8789
{

‎app/code/Magento/Backend/Block/Dashboard/Totals.php

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,9 @@
1111
*/
1212
namespace Magento\Backend\Block\Dashboard;
1313

14+
/**
15+
* Totals block.
16+
*/
1417
class Totals extends \Magento\Backend\Block\Dashboard\Bar
1518
{
1619
/**
@@ -19,27 +22,28 @@ class Totals extends \Magento\Backend\Block\Dashboard\Bar
1922
protected $_template = 'Magento_Backend::dashboard/totalbar.phtml';
2023

2124
/**
22-
* @var \Magento\Framework\Module\Manager
25+
* @var \Magento\Framework\Module\ModuleManagerInterface
2326
*/
2427
protected $_moduleManager;
2528

2629
/**
2730
* @param \Magento\Backend\Block\Template\Context $context
2831
* @param \Magento\Reports\Model\ResourceModel\Order\CollectionFactory $collectionFactory
29-
* @param \Magento\Framework\Module\Manager $moduleManager
32+
* @param \Magento\Framework\Module\ModuleManagerInterface $moduleManager
3033
* @param array $data
3134
*/
3235
public function __construct(
3336
\Magento\Backend\Block\Template\Context $context,
3437
\Magento\Reports\Model\ResourceModel\Order\CollectionFactory $collectionFactory,
35-
\Magento\Framework\Module\Manager $moduleManager,
38+
\Magento\Framework\Module\ModuleManagerInterface $moduleManager,
3639
array $data = []
3740
) {
3841
$this->_moduleManager = $moduleManager;
3942
parent::__construct($context, $collectionFactory, $data);
4043
}
4144

4245
/**
46+
* @inheritDoc
4347
* @return $this|void
4448
*/
4549
protected function _prepareLayout()

‎app/code/Magento/Backend/Model/Menu/Item.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ class Item
145145
protected $_moduleList;
146146

147147
/**
148-
* @var \Magento\Framework\Module\Manager
148+
* @var \Magento\Framework\Module\ModuleManagerInterface
149149
*/
150150
private $_moduleManager;
151151

@@ -163,7 +163,7 @@ class Item
163163
* @param \Magento\Backend\Model\MenuFactory $menuFactory
164164
* @param \Magento\Backend\Model\UrlInterface $urlModel
165165
* @param \Magento\Framework\Module\ModuleListInterface $moduleList
166-
* @param \Magento\Framework\Module\Manager $moduleManager
166+
* @param \Magento\Framework\Module\ModuleManagerInterface $moduleManager
167167
* @param array $data
168168
*/
169169
public function __construct(
@@ -173,7 +173,7 @@ public function __construct(
173173
\Magento\Backend\Model\MenuFactory $menuFactory,
174174
\Magento\Backend\Model\UrlInterface $urlModel,
175175
\Magento\Framework\Module\ModuleListInterface $moduleList,
176-
\Magento\Framework\Module\Manager $moduleManager,
176+
\Magento\Framework\Module\ModuleManagerInterface $moduleManager,
177177
array $data = []
178178
) {
179179
$this->_validator = $validator;

‎app/code/Magento/Backend/view/adminhtml/templates/admin/access_denied.phtml

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,13 @@
33
* Copyright © Magento, Inc. All rights reserved.
44
* See COPYING.txt for license details.
55
*/
6-
7-
// @codingStandardsIgnoreFile
8-
96
?>
107
<?php
118
/**
129
* @see \Magento\Backend\Block\Denied
1310
*/
11+
12+
// phpcs:disable Magento2.Security.Superglobal
1413
?>
1514
<hr class="access-denied-hr"/>
1615
<div class="access-denied-page">
@@ -21,10 +20,10 @@
2120
<li><span><?= $block->escapeHtml(__('Contact a system administrator or store owner to gain permissions.')) ?></span></li>
2221
<li>
2322
<span><?= $block->escapeHtml(__('Return to ')) ?>
24-
<?php if(isset($_SERVER['HTTP_REFERER'])): ?>
23+
<?php if (isset($_SERVER['HTTP_REFERER'])) : ?>
2524
<a href="<?= $block->escapeUrl(__($_SERVER['HTTP_REFERER'])) ?>">
2625
<?= $block->escapeHtml(__('previous page')) ?></a><?= $block->escapeHtml(__('.')) ?>
27-
<?php else: ?>
26+
<?php else : ?>
2827
<a href="<?= $block->escapeHtmlAttr(__('javascript:history.back()')) ?>">
2928
<?= $block->escapeHtml(__('previous page')) ?></a><?= $block->escapeHtml(__('.')) ?>
3029
<?php endif ?>

‎app/code/Magento/Backend/view/adminhtml/templates/admin/formkey.phtml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@
44
* See COPYING.txt for license details.
55
*/
66
?>
7-
<div><input name="form_key" type="hidden" value="<?= /* @escapeNotVerified */ $block->getFormKey() ?>" /></div>
7+
<div><input name="form_key" type="hidden" value="<?= $block->escapeHtmlAttr($block->getFormKey()) ?>" /></div>

‎app/code/Magento/Backend/view/adminhtml/templates/admin/login.phtml

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,19 +4,20 @@
44
* See COPYING.txt for license details.
55
*/
66

7-
// @codingStandardsIgnoreFile
8-
7+
/**
8+
* @var \Magento\Framework\View\Element\AbstractBlock $block
9+
*/
910
?>
1011

1112
<form method="post" action="" id="login-form" data-mage-init='{"form": {}, "validation": {}}' autocomplete="off">
1213
<fieldset class="admin__fieldset">
1314
<legend class="admin__legend">
14-
<span><?= /* @escapeNotVerified */ __('Welcome, please sign in') ?></span>
15+
<span><?= $block->escapeHtml(__('Welcome, please sign in')) ?></span>
1516
</legend><br/>
16-
<input name="form_key" type="hidden" value="<?= /* @escapeNotVerified */ $block->getFormKey() ?>" />
17+
<input name="form_key" type="hidden" value="<?= $block->escapeHtmlAttr($block->getFormKey()) ?>" />
1718
<div class="admin__field _required field-username">
1819
<label for="username" class="admin__field-label">
19-
<span><?= /* @escapeNotVerified */ __('Username') ?></span>
20+
<span><?= $block->escapeHtml(__('Username')) ?></span>
2021
</label>
2122
<div class="admin__field-control">
2223
<input id="username"
@@ -26,14 +27,14 @@
2627
autofocus
2728
value=""
2829
data-validate="{required:true}"
29-
placeholder="<?= /* @escapeNotVerified */ __('user name') ?>"
30+
placeholder="<?= $block->escapeHtmlAttr(__('user name')) ?>"
3031
autocomplete="off"
3132
/>
3233
</div>
3334
</div>
3435
<div class="admin__field _required field-password">
3536
<label for="login" class="admin__field-label">
36-
<span><?= /* @escapeNotVerified */ __('Password') ?></span>
37+
<span><?= $block->escapeHtml(__('Password')) ?></span>
3738
</label>
3839
<div class="admin__field-control">
3940
<input id="login"
@@ -42,7 +43,7 @@
4243
name="login[password]"
4344
data-validate="{required:true}"
4445
value=""
45-
placeholder="<?= /* @escapeNotVerified */ __('password') ?>"
46+
placeholder="<?= $block->escapeHtmlAttr(__('password')) ?>"
4647
autocomplete="off"
4748
/>
4849
</div>

0 commit comments

Comments
 (0)