Revert "Use factories/interfaces correctly"

This reverts commit b52f7c6.

Author: convenient

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

@@ -9,22 +9,19 @@
 use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\Console\Command\Command;
 use Magento\Framework\Mview\View;
-use Magento\Framework\Mview\View\CollectionFactory;
-use Magento\Framework\Console\Cli;
 
 /**
  * Command for displaying status of mview indexers.
  */
 class IndexerStatusMviewCommand extends Command
 {
-    /** @var \Magento\Framework\Mview\View\CollectionInterface $mviewCollection */
-    private $mviewCollection;
+    /** @var \Magento\Framework\Mview\View\CollectionInterface $mviewIndexersCollection */
+    private $mviewIndexersCollection;
 
     public function __construct(
-        CollectionFactory $collectionFactory
+        \Magento\Framework\Mview\View\CollectionInterface $collection
     ) {
-        $this->mviewCollection = $collectionFactory->create();
-
+        $this->mviewIndexersCollection = $collection;
         parent::__construct();
     }
 
@@ -50,10 +47,10 @@ protected function execute(InputInterface $input, OutputInterface $output)
 
             $rows = [];
 
-            /** @var \Magento\Framework\Mview\View $view */
-            foreach ($this->mviewCollection as $view) {
-                $state = $view->getState();
-                $changelog = $view->getChangelog();
+            /** @var \Magento\Framework\Mview\View $indexer */
+            foreach ($this->mviewIndexersCollection as $indexer) {
+                $state = $indexer->getState();
+                $changelog = $indexer->getChangelog();
 
                 try {
                     $currentVersionId = $changelog->getVersion();
@@ -69,11 +66,11 @@ protected function execute(InputInterface $input, OutputInterface $output)
                 }
 
                 $rows[] = [
-                    $view->getId(),
-                    $state->getMode(),
-                    $state->getStatus(),
-                    $state->getUpdated(),
-                    $state->getVersionId(),
+                    $indexer->getData('view_id'),
+                    $state->getData('mode'),
+                    $state->getData('status'),
+                    $state->getData('updated'),
+                    $state->getData('version_id'),
                     $pendingString,
                 ];
             }
@@ -85,14 +82,14 @@ protected function execute(InputInterface $input, OutputInterface $output)
             $table->addRows($rows);
             $table->render($output);
 
-            return Cli::RETURN_SUCCESS;
+            return \Magento\Framework\Console\Cli::RETURN_SUCCESS;
         } catch (\Exception $e) {
             $output->writeln('<error>' . $e->getMessage() . '</error>');
             if ($output->getVerbosity() >= OutputInterface::VERBOSITY_VERBOSE) {
                 $output->writeln($e->getTraceAsString());
             }
 
-            return Cli::RETURN_FAILURE;
+            return \Magento\Framework\Console\Cli::RETURN_FAILURE;
         }
     }
 }

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

@@ -12,7 +12,6 @@
 use Symfony\Component\Console\Helper\TableHelper;
 use Magento\Store\Model\Website;
 use Magento\Framework\Console\Cli;
-use Magento\Framework\Mview\View\CollectionFactory;
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
@@ -46,15 +45,9 @@ protected function setUp()
         $isLoadedProperty->setAccessible(true);
         $isLoadedProperty->setValue($this->collection, true);
 
-        $collectionFactory = $this->getMockBuilder(CollectionFactory::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-        $collectionFactory->method('create')
-            ->willReturn($this->collection);
-
         $this->command = $this->objectManager->getObject(
             IndexerStatusMviewCommand::class,
-            ['collectionFactory' => $collectionFactory]
+            ['collection' => $this->collection]
         );
 
         /** @var HelperSet $helperSet */
@@ -73,8 +66,6 @@ public function testExecute()
             [
                 'view' => [
                     'view_id' => 'catalog_category_product',
-                ],
-                'state' => [
                     'mode' => 'enabled',
                     'status' => 'idle',
                     'updated' => '2017-01-01 11:11:11',
@@ -87,8 +78,6 @@ public function testExecute()
             [
                 'view' => [
                     'view_id' => 'catalog_product_category',
-                ],
-                'state' => [
                     'mode' => 'disabled',
                     'status' => 'idle',
                     'updated' => '2017-01-01 11:11:11',
@@ -101,8 +90,6 @@ public function testExecute()
             [
                 'view' => [
                     'view_id' => 'catalog_product_attribute',
-                ],
-                'state' => [
                     'mode' => 'enabled',
                     'status' => 'idle',
                     'updated' => '2017-01-01 11:11:11',
@@ -115,7 +102,7 @@ public function testExecute()
         ];
 
         foreach ($mviews as $data) {
-            $this->collection->addItem($this->generateMviewStub($data['view'], $data['changelog'], $data['state']));
+            $this->collection->addItem($this->generateMviewStub($data['view'], $data['changelog']));
         }
         $this->collection->addItem($this->getNeverEnabledMviewIndexerWithNoTable());
 
@@ -166,19 +153,18 @@ public function testExecute()
     /**
      * @param array $viewData
      * @param array $changelogData
-     * @param array $stateData
      * @return Mview\View|Mview\View\Changelog|\PHPUnit_Framework_MockObject_MockObject
      */
-    protected function generateMviewStub(array $viewData, array $changelogData, array $stateData)
+    protected function generateMviewStub(array $viewData, array $changelogData)
     {
         /** @var Mview\View\Changelog|\PHPUnit_Framework_MockObject_MockObject $stub */
         $changelog = $this->getMockBuilder(\Magento\Framework\Mview\View\Changelog::class)
             ->disableOriginalConstructor()
             ->getMock();
 
         $list = [];
-        if ($changelogData['version_id'] !== $stateData['version_id']) {
-            $list = range($stateData['version_id']+1, $changelogData['version_id']);
+        if ($changelogData['version_id'] !== $viewData['version_id']) {
+            $list = range($viewData['version_id']+1, $changelogData['version_id']);
         }
 
         $changelog->expects($this->any())
@@ -189,14 +175,6 @@ protected function generateMviewStub(array $viewData, array $changelogData, arra
             ->method('getVersion')
             ->willReturn($changelogData['version_id']);
 
-        /** @var \Magento\Indexer\Model\Mview\View\State|\PHPUnit_Framework_MockObject_MockObject $stub */
-        $state = $this->getMockBuilder(\Magento\Indexer\Model\Mview\View\State::class)
-            ->disableOriginalConstructor()
-            ->setMethods(['loadByView'])
-            ->getMock();
-
-        $state->setData($stateData);
-
         /** @var Mview\View|\PHPUnit_Framework_MockObject_MockObject $stub */
         $stub = $this->getMockBuilder(\Magento\Framework\Mview\View::class)
             ->disableOriginalConstructor()
@@ -209,7 +187,7 @@ protected function generateMviewStub(array $viewData, array $changelogData, arra
 
         $stub->expects($this->any())
             ->method('getState')
-            ->willReturn($state);
+            ->willReturnSelf();
 
         $stub->setData($viewData);