From 1bdfc7c79bb4e952a9b7d03e48f35f2360a0f7f1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pawe=C5=82=20Niedzielski?=
 <pawel.tadeusz.niedzielski@gmail.com>
Date: Fri, 9 Sep 2022 10:59:44 +0200
Subject: [PATCH] IBX-3553: Moved common search service compiler passes to
 CoreBundle

---
 .../EzSystemsEzPlatformSolrSearchEngineBundle.php | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/bundle/EzSystemsEzPlatformSolrSearchEngineBundle.php b/bundle/EzSystemsEzPlatformSolrSearchEngineBundle.php
index 4f1a33e53..972a4336f 100644
--- a/bundle/EzSystemsEzPlatformSolrSearchEngineBundle.php
+++ b/bundle/EzSystemsEzPlatformSolrSearchEngineBundle.php
@@ -10,17 +10,15 @@
  */
 namespace EzSystems\EzPlatformSolrSearchEngineBundle;
 
-use EzSystems\EzPlatformSolrSearchEngine\Container\Compiler\CoreFilterRegistryPass;
-use EzSystems\EzPlatformSolrSearchEngine\Container\Compiler\GatewayRegistryPass;
-use Symfony\Component\HttpKernel\Bundle\Bundle;
-use Symfony\Component\DependencyInjection\ContainerBuilder;
 use EzSystems\EzPlatformSolrSearchEngine\Container\Compiler\AggregateCriterionVisitorPass;
 use EzSystems\EzPlatformSolrSearchEngine\Container\Compiler\AggregateFacetBuilderVisitorPass;
 use EzSystems\EzPlatformSolrSearchEngine\Container\Compiler\AggregateSortClauseVisitorPass;
-use EzSystems\EzPlatformSolrSearchEngine\Container\Compiler\FieldMapperPass;
+use EzSystems\EzPlatformSolrSearchEngine\Container\Compiler\CoreFilterRegistryPass;
 use EzSystems\EzPlatformSolrSearchEngine\Container\Compiler\EndpointRegistryPass;
-use eZ\Publish\Core\Base\Container\Compiler\Search\AggregateFieldValueMapperPass;
-use eZ\Publish\Core\Base\Container\Compiler\Search\FieldRegistryPass;
+use EzSystems\EzPlatformSolrSearchEngine\Container\Compiler\FieldMapperPass;
+use EzSystems\EzPlatformSolrSearchEngine\Container\Compiler\GatewayRegistryPass;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\HttpKernel\Bundle\Bundle;
 
 class EzSystemsEzPlatformSolrSearchEngineBundle extends Bundle
 {
@@ -39,9 +37,6 @@ public function build(ContainerBuilder $container)
         $container->addCompilerPass(new EndpointRegistryPass());
         $container->addCompilerPass(new GatewayRegistryPass());
         $container->addCompilerPass(new CoreFilterRegistryPass());
-
-        $container->addCompilerPass(new AggregateFieldValueMapperPass());
-        $container->addCompilerPass(new FieldRegistryPass());
     }
 
     public function getContainerExtension()