Merge remote-tracking branch 'origin/2.4-develop' into ims-phase1

Author: andimov

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

@@ -19,9 +19,9 @@
  */
 class IndexerShowDimensionsModeCommand extends AbstractIndexerCommand
 {
-    const INPUT_KEY_INDEXER = 'indexer';
-    const DIMENSION_MODE_NONE = 'none';
-    const XML_PATH_DIMENSIONS_MODE_MASK = 'indexer/%s/dimensions_mode';
+    private const INPUT_KEY_INDEXER = 'indexer';
+    private const DIMENSION_MODE_NONE = 'none';
+    private const XML_PATH_DIMENSIONS_MODE_MASK = 'indexer/%s/dimensions_mode';
     /**
      * @var string
      */
@@ -36,24 +36,31 @@ class IndexerShowDimensionsModeCommand extends AbstractIndexerCommand
      * @var string[]
      */
     private $indexers;
+    /**
+     * @var string[]
+     */
+    private $optionalIndexers;
 
     /**
      * @param ObjectManagerFactory $objectManagerFactory
      * @param ScopeConfigInterface $configReader
      * @param array $indexers
+     * @param array $optionalIndexers
      */
     public function __construct(
         ObjectManagerFactory $objectManagerFactory,
         ScopeConfigInterface $configReader,
-        array $indexers
+        array $indexers,
+        array $optionalIndexers = []
     ) {
         $this->configReader = $configReader;
         $this->indexers = $indexers;
+        $this->optionalIndexers = $optionalIndexers;
         parent::__construct($objectManagerFactory);
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     protected function configure()
     {
@@ -64,7 +71,7 @@ protected function configure()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      * @param InputInterface $input
      * @param OutputInterface $output
      * @return int
@@ -92,10 +99,12 @@ protected function execute(InputInterface $input, OutputInterface $output)
                 $output->writeln(sprintf('%-50s ', $indexer->getTitle() . ':') . $mode);
             }
         } catch (\Exception $e) {
-            $output->writeln('"' . $indexer->getTitle() . '" indexer process unknown error:' . PHP_EOL);
-            $output->writeln($e->getMessage() . PHP_EOL);
-            // we must have an exit code higher than zero to indicate something was wrong
-            $returnValue = Cli::RETURN_FAILURE;
+            if (!in_array($indexerId, $this->optionalIndexers)) { /** @phpstan-ignore-line */
+                $output->writeln('"' . $indexer->getTitle() . '" indexer process unknown error:' . PHP_EOL);
+                $output->writeln($e->getMessage() . PHP_EOL);
+                // we must have an exit code higher than zero to indicate something was wrong
+                $returnValue = Cli::RETURN_FAILURE;
+            }
         }
 
         return $returnValue;
@@ -112,7 +121,7 @@ private function getInputList(): array
         $arguments[] = new InputArgument(
             self::INPUT_KEY_INDEXER,
             InputArgument::OPTIONAL | InputArgument::IS_ARRAY,
-            $optionDescription . ' (' . implode($this->indexers) . ')'
+            $optionDescription . ' (' . implode(',', $this->indexers) . ')'
         );
 
         return $arguments;

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

@@ -41,16 +41,26 @@ class IndexerShowDimensionsModeCommandTest extends AbstractIndexerCommandCommonS
      */
     private $indexerMock;
 
+    /**
+     * @var string[]
+     */
+    private $optionalIndexers;
+
+    /**
+     * @var ObjectManagerHelper
+     */
+    private $objectManagerHelper;
+
     /**
      * @inheritdoc
      */
     protected function setUp(): void
     {
         parent::setUp();
-        $objectManagerHelper = new ObjectManagerHelper($this);
+        $this->objectManagerHelper = new ObjectManagerHelper($this);
         $this->configReaderMock = $this->getMockForAbstractClass(ScopeConfigInterface::class);
         $this->indexers = ['indexer_1' => 'indexer_1', 'indexer_2' => 'indexer_2'];
-        $this->command = $objectManagerHelper->getObject(
+        $this->command = $this->objectManagerHelper->getObject(
             IndexerShowDimensionsModeCommand::class,
             [
                 'objectManagerFactory' => $this->objectManagerFactory,
@@ -98,6 +108,29 @@ public function testExecuteWithAttributes($command, $consoleOutput)
         );
     }
 
+    public function testExecuteWithOptionalIndexers()
+    {
+        $this->optionalIndexers = ['indexer_3'];
+        $this->indexers = ['indexer_3'=> 'indexer_3'];
+        $this->command = $this->objectManagerHelper->getObject(
+            IndexerShowDimensionsModeCommand::class,
+            [
+                'objectManagerFactory' => $this->objectManagerFactory,
+                'configReader'         => $this->configReaderMock,
+                'indexers'             => $this->indexers,
+                'optionalIndexers'     => $this->optionalIndexers
+            ]
+        );
+        $command = ['indexer' => ['indexer_3']];
+        $this->configureAdminArea();
+        /** @var CommandTester $commandTester */
+        $commandTester = new CommandTester($this->command);
+        $this->indexerMock->method('load')->willThrowException(new \InvalidArgumentException());
+        $commandTester->execute($command);
+        $actualValue = $commandTester->getDisplay();
+        $this->assertEquals('', $actualValue);
+    }
+
     /**
      * @return array
      */

dev/tests/integration/testsuite/Magento/CatalogUrlRewrite/Model/Category/Plugin/StorageTest.php

@@ -12,6 +12,7 @@
 use Magento\Catalog\Model\Product\Media\ConfigInterface;
 use Magento\Framework\App\Bootstrap as AppBootstrap;
 use Magento\Framework\App\Filesystem\DirectoryList;
+use Magento\Framework\App\ResourceConnection;
 use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Framework\Filesystem;
 use Magento\Framework\Filesystem\Driver\File;
@@ -139,6 +140,9 @@ private function removeFiles(): void
      */
     private function removeProducts(): void
     {
+        $resource = $this->objectManager->get(ResourceConnection::class);
+        $connection = $resource->getConnection();
+        $connection->delete('catalog_category_product');
         foreach ($this->createdProductsSkus as $sku) {
             try {
                 $this->productRepository->deleteById($sku);

dev/tests/integration/testsuite/Magento/CatalogUrlRewrite/Model/CategoryUrlRewriteGeneratorTest.php

@@ -11,12 +11,14 @@
 use Magento\Catalog\Model\CategoryRepository;
 use Magento\Catalog\Model\ProductRepository;
 use Magento\CatalogUrlRewrite\Model\ResourceModel\Category\Product;
+use Magento\Framework\App\ResourceConnection;
 use Magento\Framework\Exception\CouldNotSaveException;
 use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Framework\ObjectManagerInterface;
 use Magento\TestFramework\Helper\Bootstrap;
 use Magento\UrlRewrite\Model\OptionProvider;
+use Magento\UrlRewrite\Model\Storage\DbStorage;
 use Magento\UrlRewrite\Model\UrlFinderInterface;
 use Magento\UrlRewrite\Service\V1\Data\UrlRewrite;
 use PHPUnit\Framework\Exception;
@@ -44,6 +46,9 @@ protected function setUp(): void
      */
     public function testGenerateUrlRewritesWithoutSaveHistory()
     {
+        $resource = $this->objectManager->get(ResourceConnection::class);
+        $connection = $resource->getConnection();
+        $connection->delete(DbStorage::TABLE_NAME);
         /** @var Category $category */
         $category = $this->objectManager->create(Category::class);
         $category->load(3);