fix(symfony): Fix Symfony Bundle issues (#144)

Refs: #143, #126
jolicode · Jan 16, 2023 · 2a8c211 · 2a8c211
1 parent 77e4547
commit 2a8c211
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/src/Bridge/Symfony/DependencyInjection/ElasticallyExtension.php b/src/Bridge/Symfony/DependencyInjection/ElasticallyExtension.php
@@ -14,6 +14,7 @@
 use JoliCode\Elastically\Client;
 use JoliCode\Elastically\IndexBuilder;
 use JoliCode\Elastically\Indexer;
+use JoliCode\Elastically\IndexNameMapper;
 use Symfony\Component\Config\FileLocator;
 use Symfony\Component\DependencyInjection\ChildDefinition;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
@@ -96,10 +97,11 @@ private function buildConnection(string $name, array $config, bool $isDefaultCon
         $indexBuilder = new ChildDefinition('elastically.abstract.index_builder');
         $indexBuilder->replaceArgument('$mappingProvider', new Reference("elastically.{$name}.mapping.provider"));
         $indexBuilder->replaceArgument('$client', new Reference("elastically.{$name}.client"));
-        $indexBuilder->replaceArgument('$indexNameMapper', new Reference("elastically.{$name}.index_name_mapper"));
+        $indexBuilder->replaceArgument('$indexNameMapper', new Reference($indexNameMapperId = "elastically.{$name}.index_name_mapper"));
         $container->setDefinition($id = "elastically.{$name}.index_builder", $indexBuilder);
         if ($isDefaultConnection) {
             $container->setAlias(IndexBuilder::class, $id);
+            $container->setAlias(IndexNameMapper::class, $indexNameMapperId);
         }
         $container->registerAliasForArgument($id, IndexBuilder::class, $name . 'IndexBuilder');
     }

diff --git a/src/Messenger/IndexationRequestHandler.php b/src/Messenger/IndexationRequestHandler.php
@@ -17,11 +17,12 @@
 use JoliCode\Elastically\Indexer;
 use JoliCode\Elastically\IndexNameMapper;
 use Psr\Log\NullLogger;
+use Symfony\Component\Messenger\Attribute\AsMessageHandler;
 use Symfony\Component\Messenger\Exception\UnrecoverableMessageHandlingException;
-use Symfony\Component\Messenger\Handler\MessageHandlerInterface;
 use Symfony\Component\Messenger\MessageBusInterface;
 
-class IndexationRequestHandler implements MessageHandlerInterface
+#[AsMessageHandler]
+class IndexationRequestHandler
 {
     public const OP_INDEX = 'index';
     public const OP_DELETE = 'delete';