Skip to content

Commit 46178aa

Browse files
minor changes
1 parent 69badcd commit 46178aa

File tree

4 files changed

+17
-14
lines changed

4 files changed

+17
-14
lines changed

app/code/Magento/AsynchronousOperations/Model/BulkNotificationManagement.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
use Magento\Framework\EntityManager\MetadataPool;
1111
use Magento\AsynchronousOperations\Model\ResourceModel\Bulk\CollectionFactory as BulkCollectionFactory;
1212
use Magento\Framework\Data\Collection;
13-
use \Magento\Authorization\Model\UserContextInterface;
13+
use Magento\Authorization\Model\UserContextInterface;
1414

1515
/**
1616
* Class for bulk notification manager

app/code/Magento/AsynchronousOperations/Model/GetBulksByUserAndType.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,18 +48,18 @@ class GetBulksByUserAndType implements GetBulksByUserAndTypeInterface
4848
private $calculatedStatusSql;
4949

5050
/**
51-
* @param ResourceConnection $resourceConnection
5251
* @param CalculatedStatusSql $calculatedStatusSql
52+
* @param ResourceConnection $resourceConnection
5353
* @param CollectionFactory $bulkCollection
5454
*/
5555
public function __construct(
56-
ResourceConnection $resourceConnection,
5756
CalculatedStatusSql $calculatedStatusSql,
57+
ResourceConnection $resourceConnection,
5858
CollectionFactory $bulkCollection
5959
) {
60-
$this->bulkCollectionFactory = $bulkCollection;
61-
$this->resourceConnection = $resourceConnection;
6260
$this->calculatedStatusSql = $calculatedStatusSql;
61+
$this->resourceConnection = $resourceConnection;
62+
$this->bulkCollectionFactory = $bulkCollection;
6363
}
6464

6565
/**

app/code/Magento/AsynchronousOperations/Model/ResourceModel/System/Message/Collection/Synchronized/Plugin.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -89,8 +89,8 @@ public function __construct(
8989
BulkNotificationManagement $bulkNotificationManagement,
9090
UserContextInterface $userContext,
9191
Details $operationDetails,
92+
AuthorizationInterface $authorization,
9293
StatusMapper $statusMapper,
93-
?AuthorizationInterface $authorization = null,
9494
?Encryptor $encryptor = null,
9595
?GetBulksByUserAndTypeInterface $getBulksByUserAndType = null
9696
) {
@@ -99,8 +99,8 @@ public function __construct(
9999
$this->userContext = $userContext;
100100
$this->operationDetails = $operationDetails;
101101
$this->bulkNotificationManagement = $bulkNotificationManagement;
102+
$this->authorization = $authorization;
102103
$this->statusMapper = $statusMapper;
103-
$this->authorization = $authorization ?: ObjectManager::getInstance()->get(AuthorizationInterface::class);
104104
$this->encryptor = $encryptor ?: ObjectManager::getInstance()->get(Encryptor::class);
105105
$this->getBulksByUserAndType = $getBulksByUserAndType
106106
?: ObjectManager::getInstance()->get(GetBulksByUserAndTypeInterface::class);

app/code/Magento/AsynchronousOperations/Ui/Component/DataProvider/SearchResult.php

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
use Magento\Framework\Data\Collection\EntityFactoryInterface as EntityFactory;
1010
use Magento\Framework\Event\ManagerInterface as EventManager;
1111
use Psr\Log\LoggerInterface as Logger;
12+
use Magento\Authorization\Model\UserContextInterface;
1213
use Magento\Framework\Bulk\BulkSummaryInterface;
1314
use Magento\AsynchronousOperations\Model\StatusMapper;
1415
use Magento\AsynchronousOperations\Model\BulkStatus\CalculatedStatusSql;
@@ -18,6 +19,11 @@
1819
*/
1920
class SearchResult extends \Magento\Framework\View\Element\UiComponent\DataProvider\SearchResult
2021
{
22+
/**
23+
* @var UserContextInterface
24+
*/
25+
private $userContext;
26+
2127
/**
2228
* @var StatusMapper
2329
*/
@@ -39,25 +45,27 @@ class SearchResult extends \Magento\Framework\View\Element\UiComponent\DataProvi
3945
* @param Logger $logger
4046
* @param FetchStrategy $fetchStrategy
4147
* @param EventManager $eventManager
48+
* @param UserContextInterface $userContextInterface
4249
* @param StatusMapper $statusMapper
4350
* @param CalculatedStatusSql $calculatedStatusSql
4451
* @param string $mainTable
4552
* @param null|string $resourceModel
4653
* @param string $identifierName
4754
* @SuppressWarnings(PHPMD.ExcessiveParameterList)
48-
* @throws \Magento\Framework\Exception\LocalizedException
4955
*/
5056
public function __construct(
5157
EntityFactory $entityFactory,
5258
Logger $logger,
5359
FetchStrategy $fetchStrategy,
5460
EventManager $eventManager,
61+
UserContextInterface $userContextInterface,
5562
StatusMapper $statusMapper,
5663
CalculatedStatusSql $calculatedStatusSql,
5764
$mainTable = 'magento_bulk',
5865
$resourceModel = null,
5966
$identifierName = 'uuid'
6067
) {
68+
$this->userContext = $userContextInterface;
6169
$this->statusMapper = $statusMapper;
6270
$this->calculatedStatusSql = $calculatedStatusSql;
6371
parent::__construct(
@@ -99,12 +107,7 @@ protected function _afterLoad()
99107
}
100108

101109
/**
102-
* Add additional field for filter request
103-
*
104-
* @param array|string $field
105-
* @param string|array $condition
106-
*
107-
* @return $this
110+
* @inheritdoc
108111
*/
109112
public function addFieldToFilter($field, $condition = null)
110113
{

0 commit comments

Comments
 (0)