Remove the usage of NonExistingIndexException

Setono · Jul 3, 2024 · 264cee0 · 264cee0
1 parent 457f872
commit 264cee0
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 34 deletions.
diff --git a/src/Config/IndexRegistry.php b/src/Config/IndexRegistry.php
@@ -4,8 +4,6 @@
 
 namespace Setono\SyliusMeilisearchPlugin\Config;
 
-use Setono\SyliusMeilisearchPlugin\Exception\NonExistingIndexException;
-
 /**
  * @implements \IteratorAggregate<string, Index>
  */
@@ -21,19 +19,20 @@ final class IndexRegistry implements \IteratorAggregate, IndexRegistryInterface
     public function add(Index $index): void
     {
         if (isset($this->indexes[$index->name])) {
-            throw new \InvalidArgumentException(sprintf('An index with the name %s already exists', $index->name)); // todo better exception
+            throw new \InvalidArgumentException(sprintf('An index with the name %s already exists', $index->name));
         }
 
         $this->indexes[$index->name] = $index;
     }
 
-    /**
-     * @throws NonExistingIndexException if no index exists with the given name
-     */
     public function get(string $name): Index
     {
         if (!isset($this->indexes[$name])) {
-            throw NonExistingIndexException::fromName($name, array_keys($this->indexes));
+            throw new \InvalidArgumentException(sprintf(
+                'No index exists with the name %s. Available indexes are: [%s]',
+                implode(', ', array_keys($this->indexes)),
+                $name,
+            ));
         }
 
         return $this->indexes[$name];

diff --git a/src/Config/IndexRegistryInterface.php b/src/Config/IndexRegistryInterface.php
@@ -4,8 +4,6 @@
 
 namespace Setono\SyliusMeilisearchPlugin\Config;
 
-use Setono\SyliusMeilisearchPlugin\Exception\NonExistingIndexException;
-
 /**
  * @extends \Traversable<Index>
  */
@@ -17,7 +15,7 @@ interface IndexRegistryInterface extends \Traversable
     public function add(Index $index): void;
 
     /**
-     * @throws NonExistingIndexException if no index exists with the given name
+     * @throws \InvalidArgumentException if no index exists with the given name
      */
     public function get(string $name): Index;
 

diff --git a/src/Exception/NonExistingIndexException.php b/src/Exception/NonExistingIndexException.php
diff --git a/src/Message/Handler/IndexHandler.php b/src/Message/Handler/IndexHandler.php
@@ -5,7 +5,6 @@
 namespace Setono\SyliusMeilisearchPlugin\Message\Handler;
 
 use Setono\SyliusMeilisearchPlugin\Config\IndexRegistryInterface;
-use Setono\SyliusMeilisearchPlugin\Exception\NonExistingIndexException;
 use Setono\SyliusMeilisearchPlugin\Message\Command\Index;
 use Symfony\Component\Messenger\Exception\UnrecoverableMessageHandlingException;
 
@@ -19,7 +18,7 @@ public function __invoke(Index $message): void
     {
         try {
             $this->indexRegistry->get($message->index)->indexer()->index();
-        } catch (NonExistingIndexException $e) {
+        } catch (\InvalidArgumentException $e) {
             throw new UnrecoverableMessageHandlingException(message: $e->getMessage(), previous: $e);
         }
     }