Merge branch 'patch-1' of github.com:convenient/mtwo into 2.4-develop-prs

Author: ishakhsuvarov

app/code/Magento/Indexer/Console/Command/IndexerResetStateCommand.php

@@ -10,14 +10,15 @@
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
 use Magento\Framework\Indexer\ConfigInterface;
+use Magento\Framework\Console\Cli;
 
 /**
  * Command for invalidating indexers.
  */
 class IndexerResetStateCommand extends AbstractIndexerManageCommand
 {
     /**
-     * {@inheritdoc}
+     * Configures the current command.
      */
     protected function configure()
     {
@@ -29,16 +30,18 @@ protected function configure()
     }
 
     /**
-     * {@inheritdoc}
+     * Invalidate / reset the indexer
+     *
+     * @param InputInterface $input
+     * @param OutputInterface $output
+     * @return int
      */
     protected function execute(InputInterface $input, OutputInterface $output)
     {
         $indexers = $this->getIndexers($input);
         foreach ($indexers as $indexer) {
             try {
-                $indexer->getState()
-                    ->setStatus(\Magento\Framework\Indexer\StateInterface::STATUS_INVALID)
-                    ->save();
+                $indexer->invalidate();
                 $output->writeln($indexer->getTitle() . ' indexer has been invalidated.');
             } catch (LocalizedException $e) {
                 $output->writeln($e->getMessage());
@@ -47,5 +50,6 @@ protected function execute(InputInterface $input, OutputInterface $output)
                 $output->writeln($e->getMessage());
             }
         }
+        return Cli::RETURN_SUCCESS;
     }
 }

app/code/Magento/Indexer/Test/Unit/Console/Command/IndexerResetStateCommandTest.php

@@ -22,32 +22,17 @@ class IndexerResetStateCommandTest extends AbstractIndexerCommandCommonSetup
      */
     private $command;
 
-    protected function setUp(): void
-    {
-        parent::setUp();
-        $this->stateMock->expects($this->once())->method('setAreaCode')->with(FrontNameResolver::AREA_CODE);
-    }
-
     public function testExecute()
     {
         $this->configureAdminArea();
         $indexerOne = $this->getIndexerMock(
-            ['getState'],
+            ['invalidate'],
             ['indexer_id' => 'indexer_1', 'title' => 'Title_indexerOne']
         );
         $this->initIndexerCollectionByItems([$indexerOne]);
 
-        $stateMock = $this->createMock(State::class);
-        $stateMock->expects($this->exactly(1))
-            ->method('setStatus')
-            ->with(StateInterface::STATUS_INVALID)->willReturnSelf();
-
-        $stateMock->expects($this->exactly(1))
-            ->method('save');
-
         $indexerOne->expects($this->once())
-            ->method('getState')
-            ->willReturn($stateMock);
+            ->method('invalidate');
 
         $this->command = new IndexerResetStateCommand($this->objectManagerFactory);
         $commandTester = new CommandTester($this->command);