Fix collecting index names when indices not provided

Author: norkunas

src/Command/IndexCommand.php

@@ -38,6 +38,7 @@ protected function getIndices(): Collection
 
     protected function getEntitiesFromArgs(InputInterface $input, OutputInterface $output): Collection
     {
+        $indices = $this->getIndices();
         $indexNames = collect();
 
         if ($indexList = $input->getOption('indices')) {
@@ -52,18 +53,18 @@ protected function getEntitiesFromArgs(InputInterface $input, OutputInterface $o
             });
         }
 
-        $config = $this->searchService->getConfiguration();
-
-        if ((0 === count($indexNames)) && count($config->get('indices')) > 0) {
-            $indexNames = $this->getIndices();
-        }
-
-        if (0 === count($indexNames)) {
+        if (0 === count($indexNames) && 0 === count($indices)) {
             $output->writeln(
                 '<comment>No indices specified. Please either specify indices using the cli option or YAML configuration.</comment>'
             );
+
+            return collect();
+        }
+
+        if (count($indexNames) > 0) {
+            return $indices->reject(fn (array $item) => !in_array($item['name'], $indexNames->toArray(), true));
         }
 
-        return collect($this->getIndices())->reject(fn (array $item) => !in_array($item['name'], $indexNames->toArray(), true));
+        return $indices;
     }
 }

tests/Integration/CommandsTest.php

@@ -51,6 +51,60 @@ public function testSearchClearUnknownIndex(): void
         $this->assertStringContainsString('Cannot clear index. Not found.', $output);
     }
 
+    public function testSearchImportAndClearWithoutIndices(): void
+    {
+        for ($i = 0; $i <= 5; ++$i) {
+            $this->createPost();
+        }
+
+        for ($i = 0; $i <= 5; ++$i) {
+            $this->createTag(['id' => $i]);
+        }
+
+        $importCommand = $this->application->find('meili:import');
+        $importCommandTester = new CommandTester($importCommand);
+        $importCommandTester->execute([]);
+
+        $importOutput = $importCommandTester->getDisplay();
+
+        $this->assertSame(<<<'EOD'
+Importing for index MeiliSearch\Bundle\Test\Entity\Post
+Indexed 6 / 6 MeiliSearch\Bundle\Test\Entity\Post entities into sf_phpunit__posts index
+Indexed 6 / 6 MeiliSearch\Bundle\Test\Entity\Post entities into sf_phpunit__aggregated index
+Settings updated.
+Settings updated.
+Importing for index MeiliSearch\Bundle\Test\Entity\Comment
+Importing for index MeiliSearch\Bundle\Test\Entity\Tag
+Indexed 6 / 6 MeiliSearch\Bundle\Test\Entity\Tag entities into sf_phpunit__tags index
+Indexed 6 / 6 MeiliSearch\Bundle\Test\Entity\Tag entities into sf_phpunit__aggregated index
+Importing for index MeiliSearch\Bundle\Test\Entity\Link
+Importing for index MeiliSearch\Bundle\Test\Entity\Post
+Indexed 6 / 6 MeiliSearch\Bundle\Test\Entity\Post entities into sf_phpunit__posts index
+Indexed 6 / 6 MeiliSearch\Bundle\Test\Entity\Post entities into sf_phpunit__aggregated index
+Importing for index MeiliSearch\Bundle\Test\Entity\Tag
+Indexed 6 / 6 MeiliSearch\Bundle\Test\Entity\Tag entities into sf_phpunit__tags index
+Indexed 6 / 6 MeiliSearch\Bundle\Test\Entity\Tag entities into sf_phpunit__aggregated index
+Done!
+
+EOD, $importOutput);
+
+        $clearCommand = $this->application->find('meili:clear');
+        $clearCommandTester = new CommandTester($clearCommand);
+        $clearCommandTester->execute([]);
+
+        $clearOutput = $clearCommandTester->getDisplay();
+
+        $this->assertSame(<<<'EOD'
+Cleared sf_phpunit__posts index of MeiliSearch\Bundle\Test\Entity\Post
+Cleared sf_phpunit__comments index of MeiliSearch\Bundle\Test\Entity\Comment
+Cleared sf_phpunit__aggregated index of MeiliSearch\Bundle\Test\Entity\ContentAggregator
+Cleared sf_phpunit__tags index of MeiliSearch\Bundle\Test\Entity\Tag
+Cleared sf_phpunit__tags index of MeiliSearch\Bundle\Test\Entity\Link
+Done!
+
+EOD, $clearOutput);
+    }
+
     /**
      * Importing 'Tag' and 'Link' into the same 'tags' index.
      */