MAGETWO-69559: Declaration of dependencies for indexers

Author: fascinosum

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

@@ -6,8 +6,6 @@
 namespace Magento\Indexer\Console\Command;
 
 use Magento\Backend\App\Area\FrontNameResolver;
-use Magento\Framework\App\ObjectManager;
-use Magento\Framework\App\ObjectManager\ConfigLoader;
 use Magento\Framework\ObjectManagerInterface;
 use Symfony\Component\Console\Command\Command;
 use Magento\Framework\Indexer\IndexerInterface;
@@ -54,14 +52,24 @@ public function __construct(
     }
 
     /**
-     * Get all indexers
+     * Return the array of all indexers with keys as indexer ids.
      *
      * @return IndexerInterface[]
      * @since 2.0.0
      */
     protected function getAllIndexers()
     {
-        return $this->getCollectionFactory()->create()->getItems();
+        $indexers = $this->getCollectionFactory()->create()->getItems();
+        return array_combine(
+            array_map(
+                function ($item) {
+                    /** @var IndexerInterface $item */
+                    return $item->getId();
+                },
+                $indexers
+            ),
+            $indexers
+        );
     }
 
     /**

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

@@ -5,13 +5,9 @@
  */
 namespace Magento\Indexer\Console\Command;
 
+use Magento\Framework\Indexer\IndexerInterface;
 use Symfony\Component\Console\Input\InputInterface;
-use Symfony\Component\Console\Output\OutputInterface;
-use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Input\InputArgument;
-use Magento\Framework\Indexer\IndexerInterface;
-use Magento\Framework\App\ObjectManagerFactory;
-use Magento\Indexer\Model\IndexerFactory;
 
 /**
  * An Abstract class for all Indexer related commands.
@@ -25,28 +21,7 @@ abstract class AbstractIndexerManageCommand extends AbstractIndexerCommand
     const INPUT_KEY_INDEXERS = 'index';
 
     /**
-     * @var IndexerFactory
-     * @since 2.2.0
-     */
-    private $indexerFactory;
-
-    /**
-     * Constructor
-     *
-     * @param ObjectManagerFactory $objectManagerFactory
-     * @param IndexerFactory|null $indexerFactory
-     * @since 2.2.0
-     */
-    public function __construct(
-        ObjectManagerFactory $objectManagerFactory,
-        IndexerFactory $indexerFactory = null
-    ) {
-        parent::__construct($objectManagerFactory);
-        $this->indexerFactory = $indexerFactory;
-    }
-
-    /**
-     * Gets list of indexers
+     * Returns the ordered list of indexers.
      *
      * @param InputInterface $input
      * @return IndexerInterface[]
@@ -60,32 +35,21 @@ protected function getIndexers(InputInterface $input)
             $requestedTypes = $input->getArgument(self::INPUT_KEY_INDEXERS);
             $requestedTypes = array_filter(array_map('trim', $requestedTypes), 'strlen');
         }
+
         if (empty($requestedTypes)) {
-            return $this->getAllIndexers();
+            $indexers = $this->getAllIndexers();
         } else {
-            $indexers = [];
-            $unsupportedTypes = [];
-            foreach ($requestedTypes as $code) {
-                $indexer = $this->getIndexerFactory()->create();
-                try {
-                    $indexer->load($code);
-                    $indexers[] = $indexer;
-                } catch (\Exception $e) {
-                    $unsupportedTypes[] = $code;
-                }
-            }
+            $availableIndexers = $this->getAllIndexers();
+            $unsupportedTypes = array_diff($requestedTypes, array_keys($availableIndexers));
             if ($unsupportedTypes) {
-                $availableTypes = [];
-                $indexers = $this->getAllIndexers();
-                foreach ($indexers as $indexer) {
-                    $availableTypes[] = $indexer->getId();
-                }
                 throw new \InvalidArgumentException(
                     "The following requested index types are not supported: '" . join("', '", $unsupportedTypes)
-                    . "'." . PHP_EOL . 'Supported types: ' . join(", ", $availableTypes)
+                    . "'." . PHP_EOL . 'Supported types: ' . join(", ", array_keys($availableIndexers))
                 );
             }
+            $indexers = array_intersect_key($availableIndexers, array_flip($requestedTypes));
         }
+
         return $indexers;
     }
 
@@ -105,19 +69,4 @@ public function getInputList()
             ),
         ];
     }
-
-    /**
-     * Get indexer factory
-     *
-     * @return IndexerFactory
-     * @deprecated 2.2.0
-     * @since 2.2.0
-     */
-    private function getIndexerFactory()
-    {
-        if (null === $this->indexerFactory) {
-            $this->indexerFactory = $this->getObjectManager()->get(IndexerFactory::class);
-        }
-        return $this->indexerFactory;
-    }
 }