From 48194c1ef419109306a23f8d25812ac6491e79fc Mon Sep 17 00:00:00 2001
From: Maddy Chellathurai <mchellathura@ebay.com>
Date: Fri, 24 Apr 2015 09:29:05 -0500
Subject: [PATCH] MAGETWO-36067: Move dev/shell/indexer.php
- CR fixes
---
.../{ => Command}/AbstractIndexerCommand.php | 20 +++++++++----------
.../{ => Command}/IndexerInfoCommand.php | 9 +++------
.../{ => Command}/IndexerReindexCommand.php | 4 ++--
.../{ => Command}/IndexerSetModeCommand.php | 8 ++++----
.../{ => Command}/IndexerShowModeCommand.php | 4 ++--
.../{ => Command}/IndexerStatusCommand.php | 4 ++--
.../IndexerCommandCommonTestSetup.php | 2 +-
.../{ => Command}/IndexerInfoCommandTest.php | 6 +++---
.../IndexerReindexCommandTest.php | 6 +++---
.../IndexerSetModeCommandTest.php | 7 ++++---
.../IndexerShowModeCommandTest.php | 6 +++---
.../IndexerStatusCommandTest.php | 4 ++--
app/code/Magento/Indexer/etc/di.xml | 10 +++++-----
13 files changed, 44 insertions(+), 46 deletions(-)
rename app/code/Magento/Indexer/Console/{ => Command}/AbstractIndexerCommand.php (85%)
rename app/code/Magento/Indexer/Console/{ => Command}/IndexerInfoCommand.php (83%)
rename app/code/Magento/Indexer/Console/{ => Command}/IndexerReindexCommand.php (93%)
rename app/code/Magento/Indexer/Console/{ => Command}/IndexerSetModeCommand.php (94%)
rename app/code/Magento/Indexer/Console/{ => Command}/IndexerShowModeCommand.php (91%)
rename app/code/Magento/Indexer/Console/{ => Command}/IndexerStatusCommand.php (93%)
rename app/code/Magento/Indexer/Test/Unit/Console/{ => Command}/IndexerCommandCommonTestSetup.php (96%)
rename app/code/Magento/Indexer/Test/Unit/Console/{ => Command}/IndexerInfoCommandTest.php (89%)
rename app/code/Magento/Indexer/Test/Unit/Console/{ => Command}/IndexerReindexCommandTest.php (97%)
rename app/code/Magento/Indexer/Test/Unit/Console/{ => Command}/IndexerSetModeCommandTest.php (97%)
rename app/code/Magento/Indexer/Test/Unit/Console/{ => Command}/IndexerShowModeCommandTest.php (95%)
rename app/code/Magento/Indexer/Test/Unit/Console/{ => Command}/IndexerStatusCommandTest.php (96%)
diff --git a/app/code/Magento/Indexer/Console/AbstractIndexerCommand.php b/app/code/Magento/Indexer/Console/Command/AbstractIndexerCommand.php
similarity index 85%
rename from app/code/Magento/Indexer/Console/AbstractIndexerCommand.php
rename to app/code/Magento/Indexer/Console/Command/AbstractIndexerCommand.php
index d3634773284..3ae1291f7dc 100644
--- a/app/code/Magento/Indexer/Console/AbstractIndexerCommand.php
+++ b/app/code/Magento/Indexer/Console/Command/AbstractIndexerCommand.php
@@ -3,7 +3,7 @@
* Copyright © 2015 Magento. All rights reserved.
* See COPYING.txt for license details.
*/
-namespace Magento\Indexer\Console;
+namespace Magento\Indexer\Console\Command;
use Symfony\Component\Console\Input\InputInterface;
use Symfony\Component\Console\Output\OutputInterface;
@@ -64,27 +64,27 @@ class AbstractIndexerCommand extends Command
* @param OutputInterface $output
* @return IndexerInterface[]
*/
- public function getIndexers(InputInterface $input, OutputInterface $output)
+ protected function getIndexers(InputInterface $input, OutputInterface $output)
{
- $inputArguments = $input->getArgument(AbstractIndexerCommand::INPUT_KEY_INDEXERS);
+ $inputArguments = $input->getArgument(self::INPUT_KEY_INDEXERS);
if (isset($inputArguments) && sizeof($inputArguments)>0) {
$indexes = implode(',', $inputArguments);
} else {
- $indexes = AbstractIndexerCommand::INPUT_KEY_ALL;
+ $indexes = self::INPUT_KEY_ALL;
}
$indexers = $this->parseIndexerString($indexes, $output);
return $indexers;
}
/**
- * Get list of arguments for the command
+ * Get list of options and arguments for the command
*
- * @return InputOption[]
+ * @return mixed
*/
- public function getOptionsList()
+ public function getInputList()
{
return [
- new InputOption(self::INPUT_KEY_ALL, 'a', InputOption::VALUE_NONE, 'Displays status of all Indexes'),
+ new InputOption(self::INPUT_KEY_ALL, 'a', InputOption::VALUE_NONE, 'All Indexes'),
new InputArgument(
self::INPUT_KEY_INDEXERS,
InputArgument::OPTIONAL | InputArgument::IS_ARRAY,
@@ -100,10 +100,10 @@ class AbstractIndexerCommand extends Command
* @param OutputInterface $output
* @return IndexerInterface[]
*/
- public function parseIndexerString($string, OutputInterface $output)
+ protected function parseIndexerString($string, OutputInterface $output)
{
$indexers = [];
- if ($string === AbstractIndexerCommand::INPUT_KEY_ALL) {
+ if ($string === self::INPUT_KEY_ALL) {
/** @var Indexer[] $indexers */
$indexers = $this->collectionFactory->create()->getItems();
} elseif (!empty($string)) {
diff --git a/app/code/Magento/Indexer/Console/IndexerInfoCommand.php b/app/code/Magento/Indexer/Console/Command/IndexerInfoCommand.php
similarity index 83%
rename from app/code/Magento/Indexer/Console/IndexerInfoCommand.php
rename to app/code/Magento/Indexer/Console/Command/IndexerInfoCommand.php
index 3bc258836f5..9176d4901c0 100644
--- a/app/code/Magento/Indexer/Console/IndexerInfoCommand.php
+++ b/app/code/Magento/Indexer/Console/Command/IndexerInfoCommand.php
@@ -3,7 +3,7 @@
* Copyright © 2015 Magento. All rights reserved.
* See COPYING.txt for license details.
*/
-namespace Magento\Indexer\Console;
+namespace Magento\Indexer\Console\Command;
use Symfony\Component\Console\Input\InputInterface;
use Symfony\Component\Console\Output\OutputInterface;
@@ -19,10 +19,7 @@ class IndexerInfoCommand extends AbstractIndexerCommand
*/
protected function configure()
{
- $this->setName('indexer:info')
- ->setDescription(
- 'Shows allowed Indexers'
- );
+ $this->setName('indexer:info')->setDescription('Shows allowed Indexers');
}
/**
@@ -41,7 +38,7 @@ class IndexerInfoCommand extends AbstractIndexerCommand
*
* @return InputOption[]
*/
- public function getOptionsList()
+ public function getInputList()
{
return [];
}
diff --git a/app/code/Magento/Indexer/Console/IndexerReindexCommand.php b/app/code/Magento/Indexer/Console/Command/IndexerReindexCommand.php
similarity index 93%
rename from app/code/Magento/Indexer/Console/IndexerReindexCommand.php
rename to app/code/Magento/Indexer/Console/Command/IndexerReindexCommand.php
index d109d2b4f84..01f8206d4b5 100644
--- a/app/code/Magento/Indexer/Console/IndexerReindexCommand.php
+++ b/app/code/Magento/Indexer/Console/Command/IndexerReindexCommand.php
@@ -3,7 +3,7 @@
* Copyright © 2015 Magento. All rights reserved.
* See COPYING.txt for license details.
*/
-namespace Magento\Indexer\Console;
+namespace Magento\Indexer\Console\Command;
use Symfony\Component\Console\Input\InputInterface;
use Symfony\Component\Console\Output\OutputInterface;
@@ -21,7 +21,7 @@ class IndexerReindexCommand extends AbstractIndexerCommand
$this->setName('indexer:reindex')
->setDescription(
'Reindexes Data'
- )->setDefinition($this->getOptionsList());
+ )->setDefinition($this->getInputList());
parent::configure();
}
diff --git a/app/code/Magento/Indexer/Console/IndexerSetModeCommand.php b/app/code/Magento/Indexer/Console/Command/IndexerSetModeCommand.php
similarity index 94%
rename from app/code/Magento/Indexer/Console/IndexerSetModeCommand.php
rename to app/code/Magento/Indexer/Console/Command/IndexerSetModeCommand.php
index c88f7d84727..9e82381d615 100644
--- a/app/code/Magento/Indexer/Console/IndexerSetModeCommand.php
+++ b/app/code/Magento/Indexer/Console/Command/IndexerSetModeCommand.php
@@ -3,7 +3,7 @@
* Copyright © 2015 Magento. All rights reserved.
* See COPYING.txt for license details.
*/
-namespace Magento\Indexer\Console;
+namespace Magento\Indexer\Console\Command;
use Symfony\Component\Console\Input\InputInterface;
use Symfony\Component\Console\Output\OutputInterface;
@@ -30,7 +30,7 @@ class IndexerSetModeCommand extends AbstractIndexerCommand
$this->setName('indexer:set-mode')
->setDescription(
'Sets index mode type'
- )->setDefinition($this->getOptionsList());
+ )->setDefinition($this->getInputList());
parent::configure();
}
@@ -75,14 +75,14 @@ class IndexerSetModeCommand extends AbstractIndexerCommand
*
* @return InputOption[]
*/
- public function getOptionsList()
+ public function getInputList()
{
$modeOptions[] = new InputArgument(
self::INPUT_KEY_MODE,
InputArgument::OPTIONAL,
'Indexer mode type ['. self::INPUT_KEY_REALTIME . '|' . self::INPUT_KEY_SCHEDULE .']'
);
- $optionsList = array_merge($modeOptions, parent::getOptionsList());
+ $optionsList = array_merge($modeOptions, parent::getInputList());
return $optionsList;
}
diff --git a/app/code/Magento/Indexer/Console/IndexerShowModeCommand.php b/app/code/Magento/Indexer/Console/Command/IndexerShowModeCommand.php
similarity index 91%
rename from app/code/Magento/Indexer/Console/IndexerShowModeCommand.php
rename to app/code/Magento/Indexer/Console/Command/IndexerShowModeCommand.php
index 81c6e05f715..a7ac55993cb 100644
--- a/app/code/Magento/Indexer/Console/IndexerShowModeCommand.php
+++ b/app/code/Magento/Indexer/Console/Command/IndexerShowModeCommand.php
@@ -3,7 +3,7 @@
* Copyright © 2015 Magento. All rights reserved.
* See COPYING.txt for license details.
*/
-namespace Magento\Indexer\Console;
+namespace Magento\Indexer\Console\Command;
use Symfony\Component\Console\Input\InputInterface;
use Symfony\Component\Console\Output\OutputInterface;
@@ -20,7 +20,7 @@ class IndexerShowModeCommand extends AbstractIndexerCommand
{
$this->setName('indexer:show-mode')
->setDescription('Shows Index Mode')
- ->setDefinition($this->getOptionsList());
+ ->setDefinition($this->getInputList());
parent::configure();
}
diff --git a/app/code/Magento/Indexer/Console/IndexerStatusCommand.php b/app/code/Magento/Indexer/Console/Command/IndexerStatusCommand.php
similarity index 93%
rename from app/code/Magento/Indexer/Console/IndexerStatusCommand.php
rename to app/code/Magento/Indexer/Console/Command/IndexerStatusCommand.php
index 26be418ac7a..78ccc538711 100644
--- a/app/code/Magento/Indexer/Console/IndexerStatusCommand.php
+++ b/app/code/Magento/Indexer/Console/Command/IndexerStatusCommand.php
@@ -3,7 +3,7 @@
* Copyright © 2015 Magento. All rights reserved.
* See COPYING.txt for license details.
*/
-namespace Magento\Indexer\Console;
+namespace Magento\Indexer\Console\Command;
use Symfony\Component\Console\Input\InputInterface;
use Symfony\Component\Console\Output\OutputInterface;
@@ -20,7 +20,7 @@ class IndexerStatusCommand extends AbstractIndexerCommand
{
$this->setName('indexer:status')
->setDescription('Shows status of Indexer')
- ->setDefinition($this->getOptionsList());
+ ->setDefinition($this->getInputList());
parent::configure();
}
diff --git a/app/code/Magento/Indexer/Test/Unit/Console/IndexerCommandCommonTestSetup.php b/app/code/Magento/Indexer/Test/Unit/Console/Command/IndexerCommandCommonTestSetup.php
similarity index 96%
rename from app/code/Magento/Indexer/Test/Unit/Console/IndexerCommandCommonTestSetup.php
rename to app/code/Magento/Indexer/Test/Unit/Console/Command/IndexerCommandCommonTestSetup.php
index fe19758888f..323e8c9be7a 100644
--- a/app/code/Magento/Indexer/Test/Unit/Console/IndexerCommandCommonTestSetup.php
+++ b/app/code/Magento/Indexer/Test/Unit/Console/Command/IndexerCommandCommonTestSetup.php
@@ -3,7 +3,7 @@
* Copyright © 2015 Magento. All rights reserved.
* See COPYING.txt for license details.
*/
-namespace Magento\Indexer\Test\Unit\Console;
+namespace Magento\Indexer\Test\Unit\Console\Command;
use Magento\Framework\App\ObjectManagerFactory;
diff --git a/app/code/Magento/Indexer/Test/Unit/Console/IndexerInfoCommandTest.php b/app/code/Magento/Indexer/Test/Unit/Console/Command/IndexerInfoCommandTest.php
similarity index 89%
rename from app/code/Magento/Indexer/Test/Unit/Console/IndexerInfoCommandTest.php
rename to app/code/Magento/Indexer/Test/Unit/Console/Command/IndexerInfoCommandTest.php
index fbb8c486864..2abaadc57c0 100644
--- a/app/code/Magento/Indexer/Test/Unit/Console/IndexerInfoCommandTest.php
+++ b/app/code/Magento/Indexer/Test/Unit/Console/Command/IndexerInfoCommandTest.php
@@ -3,9 +3,9 @@
* Copyright © 2015 Magento. All rights reserved.
* See COPYING.txt for license details.
*/
-namespace Magento\Indexer\Test\Unit\Console;
+namespace Magento\Indexer\Test\Unit\Console\Command;
-use Magento\Indexer\Console\IndexerInfoCommand;
+use Magento\Indexer\Console\Command\IndexerInfoCommand;
use Symfony\Component\Console\Tester\CommandTester;
class IndexerInfoCommandTest extends IndexerCommandCommonTestSetup
@@ -20,7 +20,7 @@ class IndexerInfoCommandTest extends IndexerCommandCommonTestSetup
public function testGetOptions()
{
$this->command = new IndexerInfoCommand($this->objectManagerFactory);
- $this->assertSame([], $this->command->getOptionsList());
+ $this->assertSame([], $this->command->getInputList());
}
public function testExecute()
diff --git a/app/code/Magento/Indexer/Test/Unit/Console/IndexerReindexCommandTest.php b/app/code/Magento/Indexer/Test/Unit/Console/Command/IndexerReindexCommandTest.php
similarity index 97%
rename from app/code/Magento/Indexer/Test/Unit/Console/IndexerReindexCommandTest.php
rename to app/code/Magento/Indexer/Test/Unit/Console/Command/IndexerReindexCommandTest.php
index e3144f1e070..210c848dae9 100644
--- a/app/code/Magento/Indexer/Test/Unit/Console/IndexerReindexCommandTest.php
+++ b/app/code/Magento/Indexer/Test/Unit/Console/Command/IndexerReindexCommandTest.php
@@ -3,9 +3,9 @@
* Copyright © 2015 Magento. All rights reserved.
* See COPYING.txt for license details.
*/
-namespace Magento\Indexer\Test\Unit\Console;
+namespace Magento\Indexer\Test\Unit\Console\Command;
-use Magento\Indexer\Console\IndexerReindexCommand;
+use Magento\Indexer\Console\Command\IndexerReindexCommand;
use Symfony\Component\Console\Tester\CommandTester;
class IndexerReindexCommandTest extends IndexerCommandCommonTestSetup
@@ -20,7 +20,7 @@ class IndexerReindexCommandTest extends IndexerCommandCommonTestSetup
public function testGetOptions()
{
$this->command = new IndexerReindexCommand($this->objectManagerFactory);
- $optionsList = $this->command->getOptionsList();
+ $optionsList = $this->command->getInputList();
$this->assertSame(2, sizeof($optionsList));
$this->assertSame('all', $optionsList[0]->getName());
$this->assertSame('index', $optionsList[1]->getName());
diff --git a/app/code/Magento/Indexer/Test/Unit/Console/IndexerSetModeCommandTest.php b/app/code/Magento/Indexer/Test/Unit/Console/Command/IndexerSetModeCommandTest.php
similarity index 97%
rename from app/code/Magento/Indexer/Test/Unit/Console/IndexerSetModeCommandTest.php
rename to app/code/Magento/Indexer/Test/Unit/Console/Command/IndexerSetModeCommandTest.php
index da29f189b6c..2ccf19c0095 100644
--- a/app/code/Magento/Indexer/Test/Unit/Console/IndexerSetModeCommandTest.php
+++ b/app/code/Magento/Indexer/Test/Unit/Console/Command/IndexerSetModeCommandTest.php
@@ -3,9 +3,9 @@
* Copyright © 2015 Magento. All rights reserved.
* See COPYING.txt for license details.
*/
-namespace Magento\Indexer\Test\Unit\Console;
+namespace Magento\Indexer\Test\Unit\Console\Command;
-use Magento\Indexer\Console\IndexerSetModeCommand;
+use Magento\Indexer\Console\Command\IndexerSetModeCommand;
use Symfony\Component\Console\Tester\CommandTester;
/**
@@ -23,7 +23,7 @@ class IndexerSetModeCommandTest extends IndexerCommandCommonTestSetup
public function testGetOptions()
{
$this->command = new IndexerSetModeCommand($this->objectManagerFactory);
- $optionsList = $this->command->getOptionsList();
+ $optionsList = $this->command->getInputList();
$this->assertSame(3, sizeof($optionsList));
$this->assertSame('mode', $optionsList[0]->getName());
$this->assertSame('all', $optionsList[1]->getName());
@@ -144,6 +144,7 @@ class IndexerSetModeCommandTest extends IndexerCommandCommonTestSetup
],
];
}
+
public function testExecuteWithLocalizedException()
{
$indexer1 = $this->getMock('Magento\Indexer\Model\Indexer', [], [], '', false);
diff --git a/app/code/Magento/Indexer/Test/Unit/Console/IndexerShowModeCommandTest.php b/app/code/Magento/Indexer/Test/Unit/Console/Command/IndexerShowModeCommandTest.php
similarity index 95%
rename from app/code/Magento/Indexer/Test/Unit/Console/IndexerShowModeCommandTest.php
rename to app/code/Magento/Indexer/Test/Unit/Console/Command/IndexerShowModeCommandTest.php
index 693afdc8d6d..1fe11acdb18 100644
--- a/app/code/Magento/Indexer/Test/Unit/Console/IndexerShowModeCommandTest.php
+++ b/app/code/Magento/Indexer/Test/Unit/Console/Command/IndexerShowModeCommandTest.php
@@ -3,9 +3,9 @@
* Copyright © 2015 Magento. All rights reserved.
* See COPYING.txt for license details.
*/
-namespace Magento\Indexer\Test\Unit\Console;
+namespace Magento\Indexer\Test\Unit\Console\Command;
-use Magento\Indexer\Console\IndexerShowModeCommand;
+use Magento\Indexer\Console\Command\IndexerShowModeCommand;
use Symfony\Component\Console\Tester\CommandTester;
class IndexerShowModeCommandTest extends IndexerCommandCommonTestSetup
@@ -20,7 +20,7 @@ class IndexerShowModeCommandTest extends IndexerCommandCommonTestSetup
public function testGetOptions()
{
$this->command = new IndexerShowModeCommand($this->objectManagerFactory);
- $optionsList = $this->command->getOptionsList();
+ $optionsList = $this->command->getInputList();
$this->assertSame(2, sizeof($optionsList));
$this->assertSame('all', $optionsList[0]->getName());
$this->assertSame('index', $optionsList[1]->getName());
diff --git a/app/code/Magento/Indexer/Test/Unit/Console/IndexerStatusCommandTest.php b/app/code/Magento/Indexer/Test/Unit/Console/Command/IndexerStatusCommandTest.php
similarity index 96%
rename from app/code/Magento/Indexer/Test/Unit/Console/IndexerStatusCommandTest.php
rename to app/code/Magento/Indexer/Test/Unit/Console/Command/IndexerStatusCommandTest.php
index d8b9ac86b5c..e9d0a09f2fb 100644
--- a/app/code/Magento/Indexer/Test/Unit/Console/IndexerStatusCommandTest.php
+++ b/app/code/Magento/Indexer/Test/Unit/Console/Command/IndexerStatusCommandTest.php
@@ -3,9 +3,9 @@
* Copyright © 2015 Magento. All rights reserved.
* See COPYING.txt for license details.
*/
-namespace Magento\Indexer\Test\Unit\Console;
+namespace Magento\Indexer\Test\Unit\Console\Command;
-use Magento\Indexer\Console\IndexerStatusCommand;
+use Magento\Indexer\Console\Command\IndexerStatusCommand;
use Symfony\Component\Console\Tester\CommandTester;
class IndexerStatusCommandTest extends IndexerCommandCommonTestSetup
diff --git a/app/code/Magento/Indexer/etc/di.xml b/app/code/Magento/Indexer/etc/di.xml
index eae62d002dc..8c6730dffb5 100644
--- a/app/code/Magento/Indexer/etc/di.xml
+++ b/app/code/Magento/Indexer/etc/di.xml
@@ -38,11 +38,11 @@
<type name="Magento\Framework\Console\CommandList">
<arguments>
<argument name="commands" xsi:type="array">
- <item name="info" xsi:type="object">Magento\Indexer\Console\IndexerInfoCommand</item>
- <item name="reindex" xsi:type="object">Magento\Indexer\Console\IndexerReindexCommand</item>
- <item name="set-mode" xsi:type="object">Magento\Indexer\Console\IndexerSetModeCommand</item>
- <item name="show-mode" xsi:type="object">Magento\Indexer\Console\IndexerShowModeCommand</item>
- <item name="status" xsi:type="object">Magento\Indexer\Console\IndexerStatusCommand</item>
+ <item name="info" xsi:type="object">Magento\Indexer\Console\Command\IndexerInfoCommand</item>
+ <item name="reindex" xsi:type="object">Magento\Indexer\Console\Command\IndexerReindexCommand</item>
+ <item name="set-mode" xsi:type="object">Magento\Indexer\Console\Command\IndexerSetModeCommand</item>
+ <item name="show-mode" xsi:type="object">Magento\Indexer\Console\Command\IndexerShowModeCommand</item>
+ <item name="status" xsi:type="object">Magento\Indexer\Console\Command\IndexerStatusCommand</item>
</argument>
</arguments>
</type>
--
GitLab