Skip to content

Commit ea48727

Browse files
author
Oleksandr Gorkun
committed
Merge branch '2.3.3-develop' of https://github.com/magento/magento2ce into MC-19145
2 parents 059b5cc + 2a7895e commit ea48727

File tree

106 files changed

+325
-365
lines changed

Some content is hidden

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

106 files changed

+325
-365
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\ModuleManagerInterface as ModuleManager;
8+
use Magento\Framework\Module\Manager as ModuleManager;
99

1010
/**
1111
* Iterator for ReportXml modules

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

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

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

1313
/**

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

Lines changed: 3 additions & 3 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\ModuleManagerInterface
22+
* @var \Magento\Framework\Module\Manager
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\ModuleManagerInterface $moduleManager
29+
* @param \Magento\Framework\Module\Manager $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\ModuleManagerInterface $moduleManager,
36+
\Magento\Framework\Module\Manager $moduleManager,
3737
\Magento\Reports\Model\ResourceModel\Order\CollectionFactory $collectionFactory,
3838
array $data = []
3939
) {

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

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

2020
/**
21-
* @var \Magento\Framework\Module\ModuleManagerInterface
21+
* @var \Magento\Framework\Module\Manager
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\ModuleManagerInterface $moduleManager
28+
* @param \Magento\Framework\Module\Manager $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\ModuleManagerInterface $moduleManager,
34+
\Magento\Framework\Module\Manager $moduleManager,
3535
array $data = []
3636
) {
3737
$this->_moduleManager = $moduleManager;

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

Lines changed: 3 additions & 3 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\ModuleManagerInterface
22+
* @var \Magento\Framework\Module\Manager
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\ModuleManagerInterface $moduleManager
29+
* @param \Magento\Framework\Module\Manager $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\ModuleManagerInterface $moduleManager,
36+
\Magento\Framework\Module\Manager $moduleManager,
3737
\Magento\Sales\Model\ResourceModel\Report\Bestsellers\CollectionFactory $collectionFactory,
3838
array $data = []
3939
) {

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,20 +22,20 @@ class Totals extends \Magento\Backend\Block\Dashboard\Bar
2222
protected $_template = 'Magento_Backend::dashboard/totalbar.phtml';
2323

2424
/**
25-
* @var \Magento\Framework\Module\ModuleManagerInterface
25+
* @var \Magento\Framework\Module\Manager
2626
*/
2727
protected $_moduleManager;
2828

2929
/**
3030
* @param \Magento\Backend\Block\Template\Context $context
3131
* @param \Magento\Reports\Model\ResourceModel\Order\CollectionFactory $collectionFactory
32-
* @param \Magento\Framework\Module\ModuleManagerInterface $moduleManager
32+
* @param \Magento\Framework\Module\Manager $moduleManager
3333
* @param array $data
3434
*/
3535
public function __construct(
3636
\Magento\Backend\Block\Template\Context $context,
3737
\Magento\Reports\Model\ResourceModel\Order\CollectionFactory $collectionFactory,
38-
\Magento\Framework\Module\ModuleManagerInterface $moduleManager,
38+
\Magento\Framework\Module\Manager $moduleManager,
3939
array $data = []
4040
) {
4141
$this->_moduleManager = $moduleManager;

‎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\ModuleManagerInterface
148+
* @var \Magento\Framework\Module\Manager
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\ModuleManagerInterface $moduleManager
166+
* @param \Magento\Framework\Module\Manager $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\ModuleManagerInterface $moduleManager,
176+
\Magento\Framework\Module\Manager $moduleManager,
177177
array $data = []
178178
) {
179179
$this->_validator = $validator;

‎app/code/Magento/Bundle/Block/Checkout/Cart/Item/Renderer.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ class Renderer extends \Magento\Checkout\Block\Cart\Item\Renderer
3232
* @param \Magento\Framework\Url\Helper\Data $urlHelper
3333
* @param \Magento\Framework\Message\ManagerInterface $messageManager
3434
* @param PriceCurrencyInterface $priceCurrency
35-
* @param \Magento\Framework\Module\ModuleManagerInterface $moduleManager
35+
* @param \Magento\Framework\Module\Manager $moduleManager
3636
* @param InterpretationStrategyInterface $messageInterpretationStrategy
3737
* @param Configuration $bundleProductConfiguration
3838
* @param array $data
@@ -46,7 +46,7 @@ public function __construct(
4646
\Magento\Framework\Url\Helper\Data $urlHelper,
4747
\Magento\Framework\Message\ManagerInterface $messageManager,
4848
PriceCurrencyInterface $priceCurrency,
49-
\Magento\Framework\Module\ModuleManagerInterface $moduleManager,
49+
\Magento\Framework\Module\Manager $moduleManager,
5050
InterpretationStrategyInterface $messageInterpretationStrategy,
5151
Configuration $bundleProductConfiguration,
5252
array $data = []

‎app/code/Magento/Bundle/Model/ResourceModel/Indexer/Price.php

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ class Price implements DimensionalIndexerInterface
8585
private $eventManager;
8686

8787
/**
88-
* @var \Magento\Framework\Module\ModuleManagerInterface
88+
* @var \Magento\Framework\Module\Manager
8989
*/
9090
private $moduleManager;
9191

@@ -97,7 +97,7 @@ class Price implements DimensionalIndexerInterface
9797
* @param BasePriceModifier $basePriceModifier
9898
* @param JoinAttributeProcessor $joinAttributeProcessor
9999
* @param \Magento\Framework\Event\ManagerInterface $eventManager
100-
* @param \Magento\Framework\Module\ModuleManagerInterface $moduleManager
100+
* @param \Magento\Framework\Module\Manager $moduleManager
101101
* @param bool $fullReindexAction
102102
* @param string $connectionName
103103
*
@@ -111,7 +111,7 @@ public function __construct(
111111
BasePriceModifier $basePriceModifier,
112112
JoinAttributeProcessor $joinAttributeProcessor,
113113
\Magento\Framework\Event\ManagerInterface $eventManager,
114-
\Magento\Framework\Module\ModuleManagerInterface $moduleManager,
114+
\Magento\Framework\Module\Manager $moduleManager,
115115
$fullReindexAction = false,
116116
$connectionName = 'indexer'
117117
) {
@@ -139,16 +139,16 @@ public function executeByDimensions(array $dimensions, \Traversable $entityIds)
139139

140140
$temporaryPriceTable = $this->indexTableStructureFactory->create(
141141
[
142-
'tableName' => $this->tableMaintainer->getMainTmpTable($dimensions),
143-
'entityField' => 'entity_id',
144-
'customerGroupField' => 'customer_group_id',
145-
'websiteField' => 'website_id',
146-
'taxClassField' => 'tax_class_id',
147-
'originalPriceField' => 'price',
148-
'finalPriceField' => 'final_price',
149-
'minPriceField' => 'min_price',
150-
'maxPriceField' => 'max_price',
151-
'tierPriceField' => 'tier_price',
142+
'tableName' => $this->tableMaintainer->getMainTmpTable($dimensions),
143+
'entityField' => 'entity_id',
144+
'customerGroupField' => 'customer_group_id',
145+
'websiteField' => 'website_id',
146+
'taxClassField' => 'tax_class_id',
147+
'originalPriceField' => 'price',
148+
'finalPriceField' => 'final_price',
149+
'minPriceField' => 'min_price',
150+
'maxPriceField' => 'max_price',
151+
'tierPriceField' => 'tier_price',
152152
]
153153
);
154154

@@ -335,9 +335,9 @@ private function prepareBundlePriceByType($priceType, array $dimensions, $entity
335335
);
336336
$finalPrice = $connection->getLeastSql(
337337
[
338-
$price,
339-
$connection->getIfNullSql($specialPriceExpr, $price),
340-
$connection->getIfNullSql($tierPrice, $price),
338+
$price,
339+
$connection->getIfNullSql($specialPriceExpr, $price),
340+
$connection->getIfNullSql($tierPrice, $price),
341341
]
342342
);
343343
} else {
@@ -477,8 +477,8 @@ private function calculateBundleSelectionPrice($dimensions, $priceType)
477477

478478
$priceExpr = $connection->getLeastSql(
479479
[
480-
$priceExpr,
481-
$connection->getIfNullSql($tierExpr, $priceExpr),
480+
$priceExpr,
481+
$connection->getIfNullSql($tierExpr, $priceExpr),
482482
]
483483
);
484484
} else {
@@ -495,8 +495,8 @@ private function calculateBundleSelectionPrice($dimensions, $priceType)
495495
);
496496
$priceExpr = $connection->getLeastSql(
497497
[
498-
$specialExpr,
499-
$connection->getIfNullSql($tierExpr, $price),
498+
$specialExpr,
499+
$connection->getIfNullSql($tierExpr, $price),
500500
]
501501
);
502502
}

‎app/code/Magento/Bundle/Model/ResourceModel/Selection/Collection.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ class Collection extends \Magento\Catalog\Model\ResourceModel\Product\Collection
6161
* @param \Magento\Catalog\Model\ResourceModel\Helper $resourceHelper
6262
* @param \Magento\Framework\Validator\UniversalFactory $universalFactory
6363
* @param \Magento\Store\Model\StoreManagerInterface $storeManager
64-
* @param \Magento\Framework\Module\ModuleManagerInterface $moduleManager
64+
* @param \Magento\Framework\Module\Manager $moduleManager
6565
* @param \Magento\Catalog\Model\Indexer\Product\Flat\State $catalogProductFlatState
6666
* @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
6767
* @param \Magento\Catalog\Model\Product\OptionFactory $productOptionFactory
@@ -88,7 +88,7 @@ public function __construct(
8888
\Magento\Catalog\Model\ResourceModel\Helper $resourceHelper,
8989
\Magento\Framework\Validator\UniversalFactory $universalFactory,
9090
\Magento\Store\Model\StoreManagerInterface $storeManager,
91-
\Magento\Framework\Module\ModuleManagerInterface $moduleManager,
91+
\Magento\Framework\Module\Manager $moduleManager,
9292
\Magento\Catalog\Model\Indexer\Product\Flat\State $catalogProductFlatState,
9393
\Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
9494
\Magento\Catalog\Model\Product\OptionFactory $productOptionFactory,

0 commit comments

Comments
 (0)