Skip to content

Commit 75af759

Browse files
thomas-kl1thomas-kl1
committed
rename excessive long variables
1 parent 44e6a6d commit 75af759

Some content is hidden

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

51 files changed

+291
-290
lines changed

‎Controller/Adminhtml/Action/InlineEdit.php

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ class InlineEdit extends Action implements HttpPostActionInterface
3131
/**
3232
* @var ActionEntityRepositoryInterface
3333
*/
34-
private $actionEntityRepository;
34+
private $actionRepository;
3535

3636
/**
3737
* @var HydratorPool
@@ -46,19 +46,19 @@ class InlineEdit extends Action implements HttpPostActionInterface
4646
/**
4747
* @var string[]
4848
*/
49-
private $allowedAttributesByState;
49+
private $allowedAttributes;
5050

5151
public function __construct(
5252
Context $context,
53-
ActionEntityRepositoryInterface $actionEntityRepository,
53+
ActionEntityRepositoryInterface $actionRepository,
5454
HydratorPool $hydratorPool,
5555
LoggerInterface $logger,
56-
array $allowedAttributesByState
56+
array $allowedAttributes
5757
) {
58-
$this->actionEntityRepository = $actionEntityRepository;
58+
$this->actionRepository = $actionRepository;
5959
$this->hydratorPool = $hydratorPool;
6060
$this->logger = $logger;
61-
$this->allowedAttributesByState = $allowedAttributesByState;
61+
$this->allowedAttributes = $allowedAttributes;
6262
parent::__construct($context);
6363
}
6464

@@ -103,11 +103,11 @@ public function execute()
103103
private function edit(int $actionId, array $data): void
104104
{
105105
$hydrator = $this->hydratorPool->getHydrator(ActionEntityInterface::class);
106-
$actionEntity = $this->actionEntityRepository->getById($actionId);
106+
$actionEntity = $this->actionRepository->getById($actionId);
107107

108108
$allowedAttributes = array_merge(
109-
$this->allowedAttributesByState['*'] ?? [],
110-
$this->allowedAttributesByState[$actionEntity->getState()] ?? []
109+
$this->allowedAttributes['*'] ?? [],
110+
$this->allowedAttributes[$actionEntity->getState()] ?? []
111111
);
112112

113113
/** @var ActionEntityInterface $actionEntity */
@@ -116,6 +116,6 @@ private function edit(int $actionId, array $data): void
116116
array_intersect_key($data, array_fill_keys($allowedAttributes, null))
117117
);
118118

119-
$this->actionEntityRepository->save($actionEntity);
119+
$this->actionRepository->save($actionEntity);
120120
}
121121
}

‎Controller/Adminhtml/Action/MassDelete.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,17 +40,17 @@ class MassDelete extends Action implements HttpPostActionInterface
4040
/**
4141
* @var ActionEntityRepositoryInterface
4242
*/
43-
private $actionEntityRepository;
43+
private $actionRepository;
4444

4545
public function __construct(
4646
Context $context,
4747
Filter $filter,
4848
CollectionFactory $collectionFactory,
49-
ActionEntityRepositoryInterface $actionEntityRepository
49+
ActionEntityRepositoryInterface $actionRepository
5050
) {
5151
$this->filter = $filter;
5252
$this->collectionFactory = $collectionFactory;
53-
$this->actionEntityRepository = $actionEntityRepository;
53+
$this->actionRepository = $actionRepository;
5454
parent::__construct($context);
5555
}
5656

@@ -83,7 +83,7 @@ private function massAction(AbstractDb $collection): void
8383

8484
/** @var ActionInterface $actionEntity */
8585
foreach ($collection->getItems() as $actionEntity) {
86-
$this->actionEntityRepository->delete($actionEntity);
86+
$this->actionRepository->delete($actionEntity);
8787
}
8888

8989
$this->messageManager->addSuccessMessage(new Phrase('A total of %1 record(s) have been deleted.', [$count]));

‎Cron/EraseEntity.php

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -48,12 +48,12 @@ final class EraseEntity
4848
/**
4949
* @var EraseEntityRepositoryInterface
5050
*/
51-
private $eraseEntityRepository;
51+
private $eraseRepository;
5252

5353
/**
5454
* @var SearchCriteriaBuilder
5555
*/
56-
private $searchCriteriaBuilder;
56+
private $criteriaBuilder;
5757

5858
/**
5959
* @var DateTime
@@ -65,16 +65,16 @@ public function __construct(
6565
Config $config,
6666
Registry $registry,
6767
EraseEntityManagementInterface $eraseManagement,
68-
EraseEntityRepositoryInterface $eraseEntityRepository,
69-
SearchCriteriaBuilder $searchCriteriaBuilder,
68+
EraseEntityRepositoryInterface $eraseRepository,
69+
SearchCriteriaBuilder $criteriaBuilder,
7070
DateTime $dateTime
7171
) {
7272
$this->logger = $logger;
7373
$this->config = $config;
7474
$this->registry = $registry;
7575
$this->eraseManagement = $eraseManagement;
76-
$this->eraseEntityRepository = $eraseEntityRepository;
77-
$this->searchCriteriaBuilder = $searchCriteriaBuilder;
76+
$this->eraseRepository = $eraseRepository;
77+
$this->criteriaBuilder = $criteriaBuilder;
7878
$this->dateTime = $dateTime;
7979
}
8080

@@ -101,24 +101,24 @@ public function execute(): void
101101
*/
102102
private function retrieveEraseEntityList(): SearchResultsInterface
103103
{
104-
$this->searchCriteriaBuilder->addFilter(
104+
$this->criteriaBuilder->addFilter(
105105
EraseEntityInterface::SCHEDULED_AT,
106106
$this->dateTime->date(),
107107
'lteq'
108108
);
109-
$this->searchCriteriaBuilder->addFilter(
109+
$this->criteriaBuilder->addFilter(
110110
EraseEntityInterface::STATE,
111111
EraseEntityInterface::STATE_COMPLETE,
112112
'neq'
113113
);
114-
$this->searchCriteriaBuilder->addFilter(
114+
$this->criteriaBuilder->addFilter(
115115
EraseEntityInterface::STATUS,
116116
[EraseEntityInterface::STATUS_READY, EraseEntityInterface::STATUS_FAILED],
117117
'in'
118118
);
119119

120120
try {
121-
$eraseCustomerList = $this->eraseEntityRepository->getList($this->searchCriteriaBuilder->create());
121+
$eraseCustomerList = $this->eraseRepository->getList($this->criteriaBuilder->create());
122122
} catch (LocalizedException $e) {
123123
$eraseCustomerList = [];
124124
}

‎Cron/ExportEntity.php

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -33,43 +33,43 @@ final class ExportEntity
3333
/**
3434
* @var ExportEntityRepositoryInterface
3535
*/
36-
private $exportEntityRepository;
36+
private $exportRepository;
3737

3838
/**
3939
* @var ExportEntityManagementInterface
4040
*/
41-
private $exportEntityManagement;
41+
private $entityManagement;
4242

4343
/**
4444
* @var SearchCriteriaBuilder
4545
*/
46-
private $searchCriteriaBuilder;
46+
private $criteriaBuilder;
4747

4848
public function __construct(
4949
LoggerInterface $logger,
5050
Config $config,
51-
ExportEntityRepositoryInterface $exportEntityRepository,
52-
ExportEntityManagementInterface $exportEntityManagement,
53-
SearchCriteriaBuilder $searchCriteriaBuilder
51+
ExportEntityRepositoryInterface $exportRepository,
52+
ExportEntityManagementInterface $entityManagement,
53+
SearchCriteriaBuilder $criteriaBuilder
5454
) {
5555
$this->logger = $logger;
5656
$this->config = $config;
57-
$this->exportEntityRepository = $exportEntityRepository;
58-
$this->exportEntityManagement = $exportEntityManagement;
59-
$this->searchCriteriaBuilder = $searchCriteriaBuilder;
57+
$this->exportRepository = $exportRepository;
58+
$this->entityManagement = $entityManagement;
59+
$this->criteriaBuilder = $criteriaBuilder;
6060
}
6161

6262
public function execute(): void
6363
{
6464
if ($this->config->isModuleEnabled() && $this->config->isExportEnabled()) {
65-
$this->searchCriteriaBuilder->addFilter(ExportEntityInterface::EXPORTED_AT, true, 'null');
66-
$this->searchCriteriaBuilder->addFilter(ExportEntityInterface::FILE_PATH, true, 'null');
65+
$this->criteriaBuilder->addFilter(ExportEntityInterface::EXPORTED_AT, true, 'null');
66+
$this->criteriaBuilder->addFilter(ExportEntityInterface::FILE_PATH, true, 'null');
6767

6868
try {
69-
$exportList = $this->exportEntityRepository->getList($this->searchCriteriaBuilder->create());
69+
$exportList = $this->exportRepository->getList($this->criteriaBuilder->create());
7070

7171
foreach ($exportList->getItems() as $exportEntity) {
72-
$this->exportEntityManagement->export($exportEntity);
72+
$this->entityManagement->export($exportEntity);
7373
}
7474
} catch (Exception $e) {
7575
$this->logger->error($e->getMessage(), $e->getTrace());

‎Cron/ExportEntityExpired.php

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -33,39 +33,39 @@ final class ExportEntityExpired
3333
/**
3434
* @var ExportEntityRepositoryInterface
3535
*/
36-
private $exportEntityRepository;
36+
private $exportRepository;
3737

3838
/**
3939
* @var SearchCriteriaBuilder
4040
*/
41-
private $searchCriteriaBuilder;
41+
private $criteriaBuilder;
4242

4343
public function __construct(
4444
LoggerInterface $logger,
4545
Config $config,
46-
ExportEntityRepositoryInterface $exportEntityRepository,
47-
SearchCriteriaBuilder $searchCriteriaBuilder
46+
ExportEntityRepositoryInterface $exportRepository,
47+
SearchCriteriaBuilder $criteriaBuilder
4848
) {
4949
$this->logger = $logger;
5050
$this->config = $config;
51-
$this->exportEntityRepository = $exportEntityRepository;
52-
$this->searchCriteriaBuilder = $searchCriteriaBuilder;
51+
$this->exportRepository = $exportRepository;
52+
$this->criteriaBuilder = $criteriaBuilder;
5353
}
5454

5555
public function execute(): void
5656
{
5757
if ($this->config->isModuleEnabled() && $this->config->isExportEnabled()) {
58-
$this->searchCriteriaBuilder->addFilter(
58+
$this->criteriaBuilder->addFilter(
5959
ExportEntityInterface::EXPIRED_AT,
6060
(new \DateTime())->format(DateTime::DATE_PHP_FORMAT),
6161
'lteq'
6262
);
6363

6464
try {
65-
$exportList = $this->exportEntityRepository->getList($this->searchCriteriaBuilder->create());
65+
$exportList = $this->exportRepository->getList($this->criteriaBuilder->create());
6666

6767
foreach ($exportList->getItems() as $exportEntity) {
68-
$this->exportEntityRepository->delete($exportEntity);
68+
$this->exportRepository->delete($exportEntity);
6969
}
7070
} catch (Exception $e) {
7171
$this->logger->error($e->getMessage(), $e->getTrace());

‎Model/Action/ActionComposite.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -47,22 +47,22 @@ final class ActionComposite implements ActionInterface
4747
/**
4848
* @var ActionEntityRepositoryInterface
4949
*/
50-
private $actionEntityRepository;
50+
private $actionRepository;
5151

5252
public function __construct(
5353
string $type,
5454
array $actions,
5555
ContextBuilder $contextBuilder,
5656
ActionEntityBuilder $actionEntityBuilder,
5757
ResultBuilder $resultBuilder,
58-
ActionEntityRepositoryInterface $actionEntityRepository
58+
ActionEntityRepositoryInterface $actionRepository
5959
) {
6060
$this->type = $type;
6161
$this->actions = $actions;
6262
$this->contextBuilder = $contextBuilder;
6363
$this->actionEntityBuilder = $actionEntityBuilder;
6464
$this->resultBuilder = $resultBuilder;
65-
$this->actionEntityRepository = $actionEntityRepository;
65+
$this->actionRepository = $actionRepository;
6666
}
6767

6868
public function execute(ActionContextInterface $actionContext): ActionResultInterface
@@ -81,7 +81,7 @@ public function execute(ActionContextInterface $actionContext): ActionResultInte
8181
$this->actionEntityBuilder->setMessage($e->getMessage());
8282
}
8383

84-
$result = $this->result($this->actionEntityRepository->save($this->actionEntityBuilder->create()));
84+
$result = $this->result($this->actionRepository->save($this->actionEntityBuilder->create()));
8585

8686
if (isset($e)) {
8787
throw $e;

‎Model/Action/Erase/CancelAction.php

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -24,20 +24,20 @@ final class CancelAction extends AbstractAction
2424
/**
2525
* @var EraseEntityRepositoryInterface
2626
*/
27-
private $eraseEntityRepository;
27+
private $eraseRepository;
2828

2929
/**
3030
* @var EraseEntityManagementInterface
3131
*/
32-
private $eraseEntityManagement;
32+
private $entityManagement;
3333

3434
public function __construct(
3535
ResultBuilder $resultBuilder,
36-
EraseEntityRepositoryInterface $eraseEntityRepository,
37-
EraseEntityManagementInterface $eraseEntityManagement
36+
EraseEntityRepositoryInterface $eraseRepository,
37+
EraseEntityManagementInterface $entityManagement
3838
) {
39-
$this->eraseEntityRepository = $eraseEntityRepository;
40-
$this->eraseEntityManagement = $eraseEntityManagement;
39+
$this->eraseRepository = $eraseRepository;
40+
$this->entityManagement = $entityManagement;
4141
parent::__construct($resultBuilder);
4242
}
4343

@@ -48,7 +48,7 @@ public function execute(ActionContextInterface $actionContext): ActionResultInte
4848
return $this->createActionResult(
4949
[
5050
ArgumentReader::ERASE_ENTITY => $this->resolveEntity(...$arguments),
51-
'canceled' => $this->eraseEntityManagement->cancel(...$arguments)
51+
'canceled' => $this->entityManagement->cancel(...$arguments)
5252
]
5353
);
5454
}
@@ -61,7 +61,7 @@ public function execute(ActionContextInterface $actionContext): ActionResultInte
6161
*/
6262
private function resolveEntity(int $entityId, string $entityType): EraseEntityInterface
6363
{
64-
return clone $this->eraseEntityRepository->getByEntity($entityId, $entityType);
64+
return clone $this->eraseRepository->getByEntity($entityId, $entityType);
6565
}
6666

6767
private function getArguments(ActionContextInterface $actionContext): array

‎Model/Action/Erase/CreateAction.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,21 +21,21 @@ final class CreateAction extends AbstractAction
2121
/**
2222
* @var EraseEntityManagementInterface
2323
*/
24-
private $eraseEntityManagement;
24+
private $entityManagement;
2525

2626
public function __construct(
2727
ResultBuilder $resultBuilder,
28-
EraseEntityManagementInterface $eraseEntityManagement
28+
EraseEntityManagementInterface $entityManagement
2929
) {
30-
$this->eraseEntityManagement = $eraseEntityManagement;
30+
$this->entityManagement = $entityManagement;
3131
parent::__construct($resultBuilder);
3232
}
3333

3434
public function execute(ActionContextInterface $actionContext): ActionResultInterface
3535
{
3636
return $this->createActionResult(
3737
[
38-
ArgumentReader::ERASE_ENTITY => $this->eraseEntityManagement->create(
38+
ArgumentReader::ERASE_ENTITY => $this->entityManagement->create(
3939
...$this->getArguments($actionContext)
4040
)
4141
]

‎Model/Action/Erase/ExecuteAction.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,13 @@ final class ExecuteAction extends AbstractAction
1919
/**
2020
* @var EraseEntityManagementInterface
2121
*/
22-
private $eraseEntityManagement;
22+
private $entityManagement;
2323

2424
public function __construct(
2525
ResultBuilder $resultBuilder,
26-
EraseEntityManagementInterface $eraseEntityManagement
26+
EraseEntityManagementInterface $entityManagement
2727
) {
28-
$this->eraseEntityManagement = $eraseEntityManagement;
28+
$this->entityManagement = $entityManagement;
2929
parent::__construct($resultBuilder);
3030
}
3131

@@ -38,7 +38,7 @@ public function execute(ActionContextInterface $actionContext): ActionResultInte
3838
}
3939

4040
return $this->createActionResult(
41-
[ArgumentReader::ERASE_ENTITY => $this->eraseEntityManagement->process($eraseEntity)]
41+
[ArgumentReader::ERASE_ENTITY => $this->entityManagement->process($eraseEntity)]
4242
);
4343
}
4444
}

0 commit comments

Comments
 (0)