From 22fb4dae313af8e9c2291466f4dedaccce0a6dbc Mon Sep 17 00:00:00 2001 From: pykettk Date: Mon, 7 Nov 2022 18:17:12 +0000 Subject: [PATCH] Minor Reformatting + I'm particular, sorry! xD --- Console/Command/IndexerLockAll.php | 42 +++++++++++++++++++++--------- Plugin/SetIndexerModeRealtime.php | 12 +++++---- Plugin/SetIndexerModeSchedule.php | 12 +++++---- etc/adminhtml/di.xml | 6 +++-- etc/di.xml | 4 ++- 5 files changed, 50 insertions(+), 26 deletions(-) diff --git a/Console/Command/IndexerLockAll.php b/Console/Command/IndexerLockAll.php index 2dd695f..2eecf24 100644 --- a/Console/Command/IndexerLockAll.php +++ b/Console/Command/IndexerLockAll.php @@ -1,5 +1,8 @@ configWriter = $configWriter; @@ -62,11 +65,20 @@ protected function execute( /** @var Indexer $indexer */ foreach ($this->getAllIndexers() as $indexer) { $mode = $modeInput; + if (is_null($modeInput)) { - $mode = $indexer->isScheduled() ? IndexerSetModeCommand::INPUT_KEY_SCHEDULE : IndexerSetModeCommand::INPUT_KEY_REALTIME; + $mode = $indexer->isScheduled() + ? IndexerSetModeCommand::INPUT_KEY_SCHEDULE + : IndexerSetModeCommand::INPUT_KEY_REALTIME; } + $indexerConfig[$mode][] = $indexer->getIndexerId(); - $output->writeln($indexer->getTitle() . ' indexer has been locked to ' . ($mode === IndexerSetModeCommand::INPUT_KEY_SCHEDULE ? 'Update on Schedule' : 'Update on Save')); + + $output->writeln(sprintf( + '%S indexer has been locked to %s', + $indexer->getTitle(), + $mode === IndexerSetModeCommand::INPUT_KEY_SCHEDULE ? 'Update on Schedule' : 'Update on Save' + )); } $this->configWriter->saveConfig([ConfigFilePool::APP_CONFIG => ['indexers' => $indexerConfig]], true); @@ -81,13 +93,17 @@ protected function configure() $this->setDescription('Lock all indexers'); $this->setDefinition([ new InputOption( - IndexerSetModeCommand::INPUT_KEY_MODE, 'm', + IndexerSetModeCommand::INPUT_KEY_MODE, + 'm', InputArgument::OPTIONAL, - 'Passing one of two modes (' . implode(', ', - $this->modes) . ') will lock all indexers to that mode', + sprintf( + 'Passing one of two modes (%s) will lock all indexers to that mode.', + implode(', ', $this->modes) + ), null ), ]); + parent::configure(); } } diff --git a/Plugin/SetIndexerModeRealtime.php b/Plugin/SetIndexerModeRealtime.php index a531e48..446405c 100644 --- a/Plugin/SetIndexerModeRealtime.php +++ b/Plugin/SetIndexerModeRealtime.php @@ -9,18 +9,20 @@ use Element119\IndexerDeployConfig\Model\IndexerConfig; use Magento\Framework\Message\ManagerInterface as MessageManagerInterface; -use Magento\Indexer\Console\Command\IndexerSetModeCommand as IndexerMode; -use Magento\Indexer\Controller\Adminhtml\Indexer\MassChangelog; -use Magento\Indexer\Controller\Adminhtml\Indexer\MassOnTheFly; -use Magento\Indexer\Model\Indexer; +use Magento\Indexer\Console\Command\IndexerSetModeCommand; class SetIndexerModeRealtime extends SetIndexerMode { + /** + * @param IndexerConfig $indexerConfig + * @param MessageManagerInterface $messageManager + * @param string $indexerMode + */ public function __construct( IndexerConfig $indexerConfig, MessageManagerInterface $messageManager, string $indexerMode = '' ) { - parent::__construct('save', $messageManager, $indexerMode); + parent::__construct($indexerConfig, $messageManager, IndexerSetModeCommand::INPUT_KEY_REALTIME); } } diff --git a/Plugin/SetIndexerModeSchedule.php b/Plugin/SetIndexerModeSchedule.php index fe75753..30d56a2 100644 --- a/Plugin/SetIndexerModeSchedule.php +++ b/Plugin/SetIndexerModeSchedule.php @@ -9,18 +9,20 @@ use Element119\IndexerDeployConfig\Model\IndexerConfig; use Magento\Framework\Message\ManagerInterface as MessageManagerInterface; -use Magento\Indexer\Console\Command\IndexerSetModeCommand as IndexerMode; -use Magento\Indexer\Controller\Adminhtml\Indexer\MassChangelog; -use Magento\Indexer\Controller\Adminhtml\Indexer\MassOnTheFly; -use Magento\Indexer\Model\Indexer; +use Magento\Indexer\Console\Command\IndexerSetModeCommand; class SetIndexerModeSchedule extends SetIndexerMode { + /** + * @param IndexerConfig $indexerConfig + * @param MessageManagerInterface $messageManager + * @param string $indexerMode + */ public function __construct( IndexerConfig $indexerConfig, MessageManagerInterface $messageManager, string $indexerMode = '' ) { - parent::__construct('schedule', $messageManager, $indexerMode); + parent::__construct($indexerConfig, $messageManager, IndexerSetModeCommand::INPUT_KEY_SCHEDULE); } } diff --git a/etc/adminhtml/di.xml b/etc/adminhtml/di.xml index 192854e..a3e1c37 100644 --- a/etc/adminhtml/di.xml +++ b/etc/adminhtml/di.xml @@ -9,11 +9,13 @@ xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd"> - + - + diff --git a/etc/di.xml b/etc/di.xml index d89e320..496cff2 100644 --- a/etc/di.xml +++ b/etc/di.xml @@ -16,7 +16,9 @@ - Element119\IndexerDeployConfig\Console\Command\IndexerLockAll + + Element119\IndexerDeployConfig\Console\Command\IndexerLockAll +