Skip to content

Commit 9d339e1

Browse files
hostephostep
committed
Merge branch 'v1-develop' into v1
2 parents ca21ee5 + 169b9a1 commit 9d339e1

File tree

25 files changed

+2472
-1710
lines changed

25 files changed

+2472
-1710
lines changed

‎.php-auto-version‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
php82
1+
php83

‎.php-cs-fixer.php‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
use PhpCsFixer\Finder as PhpCsFixerFinder;
44
use PhpCsFixer\Config as PhpCsFixerConfig;
5-
use PhpCsFixer\Runner\Parallel\ParallelConfigFactory;
65

76
$finder = PhpCsFixerFinder::create()
87
->in(__DIR__)
@@ -12,7 +11,6 @@
1211

1312
$config = new PhpCsFixerConfig();
1413
return $config
15-
->setParallelConfig(ParallelConfigFactory::detect())
1614
->setRules([
1715
'@PER-CS' => true,
1816
'binary_operator_spaces' => ['default' => 'at_least_single_space', 'operators' => ['=>' => 'align']],
@@ -22,6 +20,7 @@
2220
'no_useless_sprintf' => true,
2321
'nullable_type_declaration_for_default_null_value' => true,
2422
'ordered_imports' => ['sort_algorithm' => 'alpha'],
23+
'operator_linebreak' => ['only_booleans' => true],
2524
'phpdoc_align' => ['align' => 'vertical'],
2625
'phpdoc_separation' => ['skip_unlisted_annotations' => true],
2726
'self_accessor' => true,

‎Checker/Catalog/Product/UrlKey/DuplicateUrlKey.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ private function storeProductUrlKeyData(int $storeId, ProductCollection $collect
124124
assert(is_numeric($product->getEntityId()));
125125
assert(is_string($product->getUrlKey()));
126126

127-
$productId = $product->getEntityId();
127+
$productId = (int) $product->getEntityId();
128128
$productSku = $product->getSku();
129129
$productUrlKey = $product->getUrlKey();
130130

‎Console/Command/CheckCategoryUrlKeys.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ protected function configure(): void
5151
parent::configure();
5252
}
5353

54-
protected function execute(InputInterface $input, OutputInterface $output)
54+
protected function execute(InputInterface $input, OutputInterface $output): int
5555
{
5656
try {
5757
$this->appState->setAreaCode(AppArea::AREA_CRONTAB);

‎Console/Command/CheckCategoryUrlPaths.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ protected function configure(): void
5151
parent::configure();
5252
}
5353

54-
protected function execute(InputInterface $input, OutputInterface $output)
54+
protected function execute(InputInterface $input, OutputInterface $output): int
5555
{
5656
try {
5757
$this->appState->setAreaCode(AppArea::AREA_CRONTAB);

‎Console/Command/CheckProductUrlKeys.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ protected function configure(): void
5555
parent::configure();
5656
}
5757

58-
protected function execute(InputInterface $input, OutputInterface $output)
58+
protected function execute(InputInterface $input, OutputInterface $output): int
5959
{
6060
try {
6161
$this->appState->setAreaCode(AppArea::AREA_CRONTAB);

‎Console/Command/CheckProductUrlPaths.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ protected function configure(): void
5151
parent::configure();
5252
}
5353

54-
protected function execute(InputInterface $input, OutputInterface $output)
54+
protected function execute(InputInterface $input, OutputInterface $output): int
5555
{
5656
try {
5757
$this->appState->setAreaCode(AppArea::AREA_CRONTAB);

‎Console/Progress.php‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,9 @@ private function updateMaxSteps(): void
9292
$reflection = new \ReflectionObject($this->progressBar);
9393
$maxStepsMethod = $reflection->getMethod('setMaxSteps');
9494
if ($maxStepsMethod->isPrivate()) {
95-
$maxStepsMethod->setAccessible(true);
95+
if (PHP_VERSION_ID < 80100) {
96+
$maxStepsMethod->setAccessible(true);
97+
}
9698
$maxStepsMethod->invoke($this->progressBar, $newMaxStepsValue);
9799
} else {
98100
$this->progressBar->setMaxSteps($newMaxStepsValue);

‎Controller/Adminhtml/Catalog/Category/UrlKey/Refresh.php‎

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,31 +11,39 @@
1111
use Baldwin\UrlDataIntegrityChecker\Storage\Meta as MetaStorage;
1212
use Magento\Backend\App\Action as BackendAction;
1313
use Magento\Backend\App\Action\Context as BackendContext;
14+
use Magento\Framework\Controller\Result\RedirectFactory as ResultRedirectFactory;
15+
use Magento\Framework\Message\ManagerInterface as MessageManagerInterface;
1416

1517
class Refresh extends BackendAction
1618
{
1719
public const ADMIN_RESOURCE = 'Baldwin_UrlDataIntegrityChecker::catalog_data_integrity';
1820

1921
private $scheduleJob;
2022
private $metaStorage;
23+
private $messagesManager;
24+
private $redirectResultFactory;
2125

2226
public function __construct(
2327
BackendContext $context,
2428
ScheduleJob $scheduleJob,
25-
MetaStorage $metaStorage
29+
MetaStorage $metaStorage,
30+
MessageManagerInterface $messagesManager,
31+
ResultRedirectFactory $redirectResultFactory
2632
) {
2733
parent::__construct($context);
2834

2935
$this->scheduleJob = $scheduleJob;
3036
$this->metaStorage = $metaStorage;
37+
$this->messagesManager = $messagesManager;
38+
$this->redirectResultFactory = $redirectResultFactory;
3139
}
3240

3341
public function execute()
3442
{
3543
$scheduled = $this->scheduleJob->schedule(CheckCategoryUrlKeyCron::JOB_NAME);
3644

3745
if ($scheduled) {
38-
$this->getMessageManager()->addSuccessMessage(
46+
$this->messagesManager->addSuccessMessage(
3947
(string) __(
4048
'The refresh job was scheduled, please check back in a few moments to see the updated results'
4149
)
@@ -45,15 +53,15 @@ public function execute()
4553
$storageIdentifier = UrlKeyChecker::STORAGE_IDENTIFIER;
4654
$this->metaStorage->setPending($storageIdentifier, MetaStorage::INITIATOR_CRON);
4755
} catch (AlreadyRefreshingException $ex) {
48-
$this->getMessageManager()->addErrorMessage($ex->getMessage());
56+
$this->messagesManager->addErrorMessage($ex->getMessage());
4957
}
5058
} else {
51-
$this->getMessageManager()->addErrorMessage(
59+
$this->messagesManager->addErrorMessage(
5260
(string) __('Couldn\'t schedule refreshing due to some unknown error')
5361
);
5462
}
5563

56-
$redirect = $this->resultRedirectFactory->create();
64+
$redirect = $this->redirectResultFactory->create();
5765
$redirect->setRefererUrl();
5866

5967
return $redirect;

‎Controller/Adminhtml/Catalog/Category/UrlPath/Refresh.php‎

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,31 +11,39 @@
1111
use Baldwin\UrlDataIntegrityChecker\Storage\Meta as MetaStorage;
1212
use Magento\Backend\App\Action as BackendAction;
1313
use Magento\Backend\App\Action\Context as BackendContext;
14+
use Magento\Framework\Controller\Result\RedirectFactory as ResultRedirectFactory;
15+
use Magento\Framework\Message\ManagerInterface as MessageManagerInterface;
1416

1517
class Refresh extends BackendAction
1618
{
1719
public const ADMIN_RESOURCE = 'Baldwin_UrlDataIntegrityChecker::catalog_data_integrity';
1820

1921
private $scheduleJob;
2022
private $metaStorage;
23+
private $messagesManager;
24+
private $redirectResultFactory;
2125

2226
public function __construct(
2327
BackendContext $context,
2428
ScheduleJob $scheduleJob,
25-
MetaStorage $metaStorage
29+
MetaStorage $metaStorage,
30+
MessageManagerInterface $messagesManager,
31+
ResultRedirectFactory $redirectResultFactory
2632
) {
2733
parent::__construct($context);
2834

2935
$this->scheduleJob = $scheduleJob;
3036
$this->metaStorage = $metaStorage;
37+
$this->messagesManager = $messagesManager;
38+
$this->redirectResultFactory = $redirectResultFactory;
3139
}
3240

3341
public function execute()
3442
{
3543
$scheduled = $this->scheduleJob->schedule(CheckCategoryUrlPathCron::JOB_NAME);
3644

3745
if ($scheduled) {
38-
$this->getMessageManager()->addSuccessMessage(
46+
$this->messagesManager->addSuccessMessage(
3947
(string) __(
4048
'The refresh job was scheduled, please check back in a few moments to see the updated results'
4149
)
@@ -45,15 +53,15 @@ public function execute()
4553
$storageIdentifier = UrlPathChecker::STORAGE_IDENTIFIER;
4654
$this->metaStorage->setPending($storageIdentifier, MetaStorage::INITIATOR_CRON);
4755
} catch (AlreadyRefreshingException $ex) {
48-
$this->getMessageManager()->addErrorMessage($ex->getMessage());
56+
$this->messagesManager->addErrorMessage($ex->getMessage());
4957
}
5058
} else {
51-
$this->getMessageManager()->addErrorMessage(
59+
$this->messagesManager->addErrorMessage(
5260
(string) __('Couldn\'t schedule refreshing due to some unknown error')
5361
);
5462
}
5563

56-
$redirect = $this->resultRedirectFactory->create();
64+
$redirect = $this->redirectResultFactory->create();
5765
$redirect->setRefererUrl();
5866

5967
return $redirect;

0 commit comments

Comments
 (0)