From c0a831a2cb25b5d999ed7a96995857cad2113a52 Mon Sep 17 00:00:00 2001 From: Bartek Wajda Date: Mon, 3 Oct 2022 13:20:14 +0200 Subject: [PATCH] IBX-3921: Removed prepended Solarium Solr configuration --- .../EzPlatformCoreExtension.php | 19 ------------------- 1 file changed, 19 deletions(-) diff --git a/src/EzPlatformCoreBundle/bundle/DependencyInjection/EzPlatformCoreExtension.php b/src/EzPlatformCoreBundle/bundle/DependencyInjection/EzPlatformCoreExtension.php index 52b7fc5..e95645c 100644 --- a/src/EzPlatformCoreBundle/bundle/DependencyInjection/EzPlatformCoreExtension.php +++ b/src/EzPlatformCoreBundle/bundle/DependencyInjection/EzPlatformCoreExtension.php @@ -99,11 +99,6 @@ private function configureGenericSetup(ContainerBuilder $container): void $container->setParameter('solr_dsn', '%env(SOLR_DSN)%'); $container->setParameter('solr_core', '%env(SOLR_CORE)%'); - $container->setParameter('siso_search.solr.host', '%env(SISO_SEARCH_SOLR_HOST)%'); - $container->setParameter('siso_search.solr.port', '%env(SISO_SEARCH_SOLR_PORT)%'); - $container->setParameter('siso_search.solr.core', '%env(SISO_SEARCH_SOLR_CORE)%'); - $container->setParameter('siso_search.solr.path', '%env(SISO_SEARCH_SOLR_PATH)%'); - $projectDir = $container->getParameter('kernel.project_dir'); if ($dfsNfsPath = $_SERVER['DFS_NFS_PATH'] ?? false) { @@ -286,20 +281,6 @@ private function configurePlatformShSetup(ContainerBuilder $container): void $container->setParameter('solr_dsn', sprintf('http://%s:%d/%s', $endpoint['host'], $endpoint['port'], 'solr')); // To set solr_core parameter we assume path is in form like: "solr/collection1" $container->setParameter('solr_core', substr($endpoint['path'], 5)); - - // Ibexa DXP Commerce needs special treatment due to Solarium use - // @todo Remove this once Commerce is fully rewritten - $bundles = $container->getParameter('kernel.bundles'); - - if (isset($bundles['SisoSearchBundle'])) { - $container->setParameter('solr_dsn', sprintf('http://%s:%d', $endpoint['host'], $endpoint['port'])); - // To set solr_core parameter we assume path is in form like: "solr/collection1" - $container->setParameter('solr_core', substr($endpoint['path'], 5)); - - $container->setParameter('siso_search.solr.host', $endpoint['host']); - $container->setParameter('siso_search.solr.port', $endpoint['port']); - $container->setParameter('siso_search.solr.core', $endpoint['rel']); - } } }