diff --git a/bundle/DependencyInjection/NetgenIbexaSearchExtraExtension.php b/bundle/DependencyInjection/NetgenIbexaSearchExtraExtension.php index 36496496..f13c81a4 100644 --- a/bundle/DependencyInjection/NetgenIbexaSearchExtraExtension.php +++ b/bundle/DependencyInjection/NetgenIbexaSearchExtraExtension.php @@ -88,7 +88,7 @@ private function processExtensionConfiguration(array $configs, ContainerBuilder $this->processIndexableFieldTypeConfiguration($configuration, $container); $this->processSearchResultExtractorConfiguration($configuration, $container); $this->processAsynchronousIndexingConfiguration($configuration, $container); - $this->processParentChildIndexingConfiguration($configuration, $container); + $this->processDescendantIndexingConfiguration($configuration, $container); } private function processSearchResultExtractorConfiguration(array $configuration, ContainerBuilder $container): void @@ -119,7 +119,7 @@ private function processAsynchronousIndexingConfiguration(array $configuration, ); } - private function processParentChildIndexingConfiguration(array $configuration, ContainerBuilder $container): void + private function processDescendantIndexingConfiguration(array $configuration, ContainerBuilder $container): void { $container->setParameter( 'netgen.ibexa_search_extra.descendant_indexing.configuration', diff --git a/lib/Container/Compiler/DescendantIndexingPass.php b/lib/Container/Compiler/DescendantIndexingPass.php index ab07c3a1..d8c23d55 100644 --- a/lib/Container/Compiler/DescendantIndexingPass.php +++ b/lib/Container/Compiler/DescendantIndexingPass.php @@ -10,19 +10,19 @@ class DescendantIndexingPass implements CompilerPassInterface { - private const ParentChildConfigurationParameter = 'netgen.ibexa_search_extra.descendant_indexing.configuration'; - private const ParentChildMessageHandlerTag = 'netgen.ibexa_search_extra.descendant_indexing.message_handler'; + private const DescendantIndexingConfigurationParameter = 'netgen.ibexa_search_extra.descendant_indexing.configuration'; + private const DescendantIndexingMessageHandlerTag = 'netgen.ibexa_search_extra.descendant_indexing.message_handler'; private const MessageHandlerTag = 'messenger.message_handler'; - private const ParentChildSolrContentFieldMapperServiceId = 'netgen.ibexa_search_extra.solr.field_mapper.descendant_indexing.content'; - private const ParentChildSolrContentFieldMapperTag = 'netgen.ibexa_search_extra.solr.field_mapper.descendant_indexing.content'; - private const ParentChildSolrContentTranslationFieldMapperServiceId = 'netgen.ibexa_search_extra.solr.field_mapper.descendant_indexing.content.translation'; - private const ParentChildSolrContentTranslationFieldMapperTag = 'netgen.ibexa_search_extra.solr.field_mapper.descendant_indexing.content.translation'; - private const ParentChildSolrLocationFieldMapperServiceId = 'netgen.ibexa_search_extra.solr.field_mapper.descendant_indexing.location'; - private const ParentChildSolrLocationFieldMapperTag = 'netgen.ibexa_search_extra.solr.field_mapper.descendant_indexing.location'; + private const DescendantIndexingSolrContentFieldMapperServiceId = 'netgen.ibexa_search_extra.solr.field_mapper.descendant_indexing.content'; + private const DescendantIndexingSolrContentFieldMapperTag = 'netgen.ibexa_search_extra.solr.field_mapper.descendant_indexing.content'; + private const DescendantIndexingSolrContentTranslationFieldMapperServiceId = 'netgen.ibexa_search_extra.solr.field_mapper.descendant_indexing.content.translation'; + private const DescendantIndexingSolrContentTranslationFieldMapperTag = 'netgen.ibexa_search_extra.solr.field_mapper.descendant_indexing.content.translation'; + private const DescendantIndexingSolrLocationFieldMapperServiceId = 'netgen.ibexa_search_extra.solr.field_mapper.descendant_indexing.location'; + private const DescendantIndexingSolrLocationFieldMapperTag = 'netgen.ibexa_search_extra.solr.field_mapper.descendant_indexing.location'; public function process(ContainerBuilder $container): void { - $configuration = $container->getParameter(self::ParentChildConfigurationParameter); + $configuration = $container->getParameter(self::DescendantIndexingConfigurationParameter); $isEnabled = $configuration['enabled'] ?? false; if (!$isEnabled) { @@ -37,7 +37,7 @@ public function process(ContainerBuilder $container): void private function registerHandlers(ContainerBuilder $container): void { - $serviceIds = $container->findTaggedServiceIds(self::ParentChildMessageHandlerTag); + $serviceIds = $container->findTaggedServiceIds(self::DescendantIndexingMessageHandlerTag); foreach ($serviceIds as $serviceId => $tag) { $definition = $container->getDefinition($serviceId); @@ -47,8 +47,8 @@ private function registerHandlers(ContainerBuilder $container): void private function registerSolrContentFieldMappers(ContainerBuilder $container): void { - $definition = $container->getDefinition(self::ParentChildSolrContentFieldMapperServiceId); - $serviceIds = $container->findTaggedServiceIds(self::ParentChildSolrContentFieldMapperTag); + $definition = $container->getDefinition(self::DescendantIndexingSolrContentFieldMapperServiceId); + $serviceIds = $container->findTaggedServiceIds(self::DescendantIndexingSolrContentFieldMapperTag); foreach (array_keys($serviceIds) as $id) { $definition->addMethodCall('addFieldMapper', [new Reference($id)]); @@ -57,8 +57,8 @@ private function registerSolrContentFieldMappers(ContainerBuilder $container): v private function registerSolrContentTranslationFieldMappers(ContainerBuilder $container): void { - $definition = $container->getDefinition(self::ParentChildSolrContentTranslationFieldMapperServiceId); - $serviceIds = $container->findTaggedServiceIds(self::ParentChildSolrContentTranslationFieldMapperTag); + $definition = $container->getDefinition(self::DescendantIndexingSolrContentTranslationFieldMapperServiceId); + $serviceIds = $container->findTaggedServiceIds(self::DescendantIndexingSolrContentTranslationFieldMapperTag); foreach (array_keys($serviceIds) as $id) { $definition->addMethodCall('addFieldMapper', [new Reference($id)]); @@ -67,8 +67,8 @@ private function registerSolrContentTranslationFieldMappers(ContainerBuilder $co private function registerSolrLocationFieldMappers(ContainerBuilder $container): void { - $definition = $container->getDefinition(self::ParentChildSolrLocationFieldMapperServiceId); - $serviceIds = $container->findTaggedServiceIds(self::ParentChildSolrLocationFieldMapperTag); + $definition = $container->getDefinition(self::DescendantIndexingSolrLocationFieldMapperServiceId); + $serviceIds = $container->findTaggedServiceIds(self::DescendantIndexingSolrLocationFieldMapperTag); foreach (array_keys($serviceIds) as $id) { $definition->addMethodCall('addFieldMapper', [new Reference($id)]); diff --git a/lib/Core/Search/Common/Messenger/MessageHandler/Search/ParentChildIndexing/AncestorIndexer.php b/lib/Core/Search/Common/Messenger/MessageHandler/Search/DescendantIndexing/AncestorIndexer.php similarity index 98% rename from lib/Core/Search/Common/Messenger/MessageHandler/Search/ParentChildIndexing/AncestorIndexer.php rename to lib/Core/Search/Common/Messenger/MessageHandler/Search/DescendantIndexing/AncestorIndexer.php index 51285913..e43a2e90 100644 --- a/lib/Core/Search/Common/Messenger/MessageHandler/Search/ParentChildIndexing/AncestorIndexer.php +++ b/lib/Core/Search/Common/Messenger/MessageHandler/Search/DescendantIndexing/AncestorIndexer.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\ParentChildIndexing; +namespace Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\DescendantIndexing; use Ibexa\Contracts\Core\Persistence\Content\Handler as ContentHandler; use Ibexa\Contracts\Core\Persistence\Content\Location; diff --git a/lib/Core/Search/Common/Messenger/MessageHandler/Search/ParentChildIndexing/AncestorPathGenerator.php b/lib/Core/Search/Common/Messenger/MessageHandler/Search/DescendantIndexing/AncestorPathGenerator.php similarity index 98% rename from lib/Core/Search/Common/Messenger/MessageHandler/Search/ParentChildIndexing/AncestorPathGenerator.php rename to lib/Core/Search/Common/Messenger/MessageHandler/Search/DescendantIndexing/AncestorPathGenerator.php index e9597669..3d8f2b99 100644 --- a/lib/Core/Search/Common/Messenger/MessageHandler/Search/ParentChildIndexing/AncestorPathGenerator.php +++ b/lib/Core/Search/Common/Messenger/MessageHandler/Search/DescendantIndexing/AncestorPathGenerator.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\ParentChildIndexing; +namespace Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\DescendantIndexing; use function array_merge; use function array_shift; diff --git a/lib/Core/Search/Common/Messenger/MessageHandler/Search/ParentChildIndexing/AncestorResolver.php b/lib/Core/Search/Common/Messenger/MessageHandler/Search/DescendantIndexing/AncestorResolver.php similarity index 99% rename from lib/Core/Search/Common/Messenger/MessageHandler/Search/ParentChildIndexing/AncestorResolver.php rename to lib/Core/Search/Common/Messenger/MessageHandler/Search/DescendantIndexing/AncestorResolver.php index 94901d04..42baf418 100644 --- a/lib/Core/Search/Common/Messenger/MessageHandler/Search/ParentChildIndexing/AncestorResolver.php +++ b/lib/Core/Search/Common/Messenger/MessageHandler/Search/DescendantIndexing/AncestorResolver.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\ParentChildIndexing; +namespace Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\DescendantIndexing; use Ibexa\Contracts\Core\Persistence\Content\Handler as ContentHandler; use Ibexa\Contracts\Core\Persistence\Content\Location; diff --git a/lib/Core/Search/Common/Messenger/MessageHandler/Search/ParentChildIndexing/Content/CopyContentHandler.php b/lib/Core/Search/Common/Messenger/MessageHandler/Search/DescendantIndexing/Content/CopyContentHandler.php similarity index 88% rename from lib/Core/Search/Common/Messenger/MessageHandler/Search/ParentChildIndexing/Content/CopyContentHandler.php rename to lib/Core/Search/Common/Messenger/MessageHandler/Search/DescendantIndexing/Content/CopyContentHandler.php index 6be41995..be51305e 100644 --- a/lib/Core/Search/Common/Messenger/MessageHandler/Search/ParentChildIndexing/Content/CopyContentHandler.php +++ b/lib/Core/Search/Common/Messenger/MessageHandler/Search/DescendantIndexing/Content/CopyContentHandler.php @@ -2,9 +2,9 @@ declare(strict_types=1); -namespace Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\ParentChildIndexing\Content; +namespace Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\DescendantIndexing\Content; -use Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\ParentChildIndexing\AncestorIndexer; +use Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\DescendantIndexing\AncestorIndexer; use Ibexa\Contracts\Core\Persistence\Content\Location\Handler as LocationHandler; use Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\Message\Search\Content\CopyContent; diff --git a/lib/Core/Search/Common/Messenger/MessageHandler/Search/ParentChildIndexing/Content/DeleteContentHandler.php b/lib/Core/Search/Common/Messenger/MessageHandler/Search/DescendantIndexing/Content/DeleteContentHandler.php similarity index 94% rename from lib/Core/Search/Common/Messenger/MessageHandler/Search/ParentChildIndexing/Content/DeleteContentHandler.php rename to lib/Core/Search/Common/Messenger/MessageHandler/Search/DescendantIndexing/Content/DeleteContentHandler.php index f85f27d9..0eb968a9 100644 --- a/lib/Core/Search/Common/Messenger/MessageHandler/Search/ParentChildIndexing/Content/DeleteContentHandler.php +++ b/lib/Core/Search/Common/Messenger/MessageHandler/Search/DescendantIndexing/Content/DeleteContentHandler.php @@ -2,12 +2,12 @@ declare(strict_types=1); -namespace Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\ParentChildIndexing\Content; +namespace Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\DescendantIndexing\Content; use Ibexa\Contracts\Core\Persistence\Content\Location\Handler as LocationHandler; use Ibexa\Contracts\Core\Repository\Exceptions\NotFoundException; use Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\Message\Search\Content\DeleteContent; -use Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\ParentChildIndexing\AncestorIndexer; +use Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\DescendantIndexing\AncestorIndexer; use Psr\Log\LoggerInterface; use Psr\Log\NullLogger; diff --git a/lib/Core/Search/Common/Messenger/MessageHandler/Search/ParentChildIndexing/Content/DeleteTranslationHandler.php b/lib/Core/Search/Common/Messenger/MessageHandler/Search/DescendantIndexing/Content/DeleteTranslationHandler.php similarity index 94% rename from lib/Core/Search/Common/Messenger/MessageHandler/Search/ParentChildIndexing/Content/DeleteTranslationHandler.php rename to lib/Core/Search/Common/Messenger/MessageHandler/Search/DescendantIndexing/Content/DeleteTranslationHandler.php index ab20de5d..49fcfd91 100644 --- a/lib/Core/Search/Common/Messenger/MessageHandler/Search/ParentChildIndexing/Content/DeleteTranslationHandler.php +++ b/lib/Core/Search/Common/Messenger/MessageHandler/Search/DescendantIndexing/Content/DeleteTranslationHandler.php @@ -2,9 +2,9 @@ declare(strict_types=1); -namespace Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\ParentChildIndexing\Content; +namespace Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\DescendantIndexing\Content; -use Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\ParentChildIndexing\AncestorIndexer; +use Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\DescendantIndexing\AncestorIndexer; use Ibexa\Contracts\Core\Persistence\Content\ContentInfo; use Ibexa\Contracts\Core\Persistence\Content\Handler as ContentHandler; use Ibexa\Contracts\Core\Persistence\Content\Location\Handler as LocationHandler; diff --git a/lib/Core/Search/Common/Messenger/MessageHandler/Search/ParentChildIndexing/Content/HideContentHandler.php b/lib/Core/Search/Common/Messenger/MessageHandler/Search/DescendantIndexing/Content/HideContentHandler.php similarity index 88% rename from lib/Core/Search/Common/Messenger/MessageHandler/Search/ParentChildIndexing/Content/HideContentHandler.php rename to lib/Core/Search/Common/Messenger/MessageHandler/Search/DescendantIndexing/Content/HideContentHandler.php index 8b0233c4..7547fb57 100644 --- a/lib/Core/Search/Common/Messenger/MessageHandler/Search/ParentChildIndexing/Content/HideContentHandler.php +++ b/lib/Core/Search/Common/Messenger/MessageHandler/Search/DescendantIndexing/Content/HideContentHandler.php @@ -2,9 +2,9 @@ declare(strict_types=1); -namespace Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\ParentChildIndexing\Content; +namespace Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\DescendantIndexing\Content; -use Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\ParentChildIndexing\AncestorIndexer; +use Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\DescendantIndexing\AncestorIndexer; use Ibexa\Contracts\Core\Persistence\Content\Location\Handler as LocationHandler; use Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\Message\Search\Content\HideContent; diff --git a/lib/Core/Search/Common/Messenger/MessageHandler/Search/ParentChildIndexing/Content/PublishVersionHandler.php b/lib/Core/Search/Common/Messenger/MessageHandler/Search/DescendantIndexing/Content/PublishVersionHandler.php similarity index 88% rename from lib/Core/Search/Common/Messenger/MessageHandler/Search/ParentChildIndexing/Content/PublishVersionHandler.php rename to lib/Core/Search/Common/Messenger/MessageHandler/Search/DescendantIndexing/Content/PublishVersionHandler.php index d248be27..cdbe3b19 100644 --- a/lib/Core/Search/Common/Messenger/MessageHandler/Search/ParentChildIndexing/Content/PublishVersionHandler.php +++ b/lib/Core/Search/Common/Messenger/MessageHandler/Search/DescendantIndexing/Content/PublishVersionHandler.php @@ -2,9 +2,9 @@ declare(strict_types=1); -namespace Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\ParentChildIndexing\Content; +namespace Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\DescendantIndexing\Content; -use Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\ParentChildIndexing\AncestorIndexer; +use Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\DescendantIndexing\AncestorIndexer; use Ibexa\Contracts\Core\Persistence\Content\Location\Handler as LocationHandler; use Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\Message\Search\Content\PublishVersion; diff --git a/lib/Core/Search/Common/Messenger/MessageHandler/Search/ParentChildIndexing/Content/RevealContentHandler.php b/lib/Core/Search/Common/Messenger/MessageHandler/Search/DescendantIndexing/Content/RevealContentHandler.php similarity index 88% rename from lib/Core/Search/Common/Messenger/MessageHandler/Search/ParentChildIndexing/Content/RevealContentHandler.php rename to lib/Core/Search/Common/Messenger/MessageHandler/Search/DescendantIndexing/Content/RevealContentHandler.php index 5c936f52..8bbf039e 100644 --- a/lib/Core/Search/Common/Messenger/MessageHandler/Search/ParentChildIndexing/Content/RevealContentHandler.php +++ b/lib/Core/Search/Common/Messenger/MessageHandler/Search/DescendantIndexing/Content/RevealContentHandler.php @@ -2,9 +2,9 @@ declare(strict_types=1); -namespace Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\ParentChildIndexing\Content; +namespace Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\DescendantIndexing\Content; -use Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\ParentChildIndexing\AncestorIndexer; +use Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\DescendantIndexing\AncestorIndexer; use Ibexa\Contracts\Core\Persistence\Content\Location\Handler as LocationHandler; use Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\Message\Search\Content\RevealContent; diff --git a/lib/Core/Search/Common/Messenger/MessageHandler/Search/ParentChildIndexing/Content/UpdateContentMetadataHandler.php b/lib/Core/Search/Common/Messenger/MessageHandler/Search/DescendantIndexing/Content/UpdateContentMetadataHandler.php similarity index 95% rename from lib/Core/Search/Common/Messenger/MessageHandler/Search/ParentChildIndexing/Content/UpdateContentMetadataHandler.php rename to lib/Core/Search/Common/Messenger/MessageHandler/Search/DescendantIndexing/Content/UpdateContentMetadataHandler.php index c854297c..9594501b 100644 --- a/lib/Core/Search/Common/Messenger/MessageHandler/Search/ParentChildIndexing/Content/UpdateContentMetadataHandler.php +++ b/lib/Core/Search/Common/Messenger/MessageHandler/Search/DescendantIndexing/Content/UpdateContentMetadataHandler.php @@ -2,9 +2,9 @@ declare(strict_types=1); -namespace Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\ParentChildIndexing\Content; +namespace Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\DescendantIndexing\Content; -use Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\ParentChildIndexing\AncestorIndexer; +use Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\DescendantIndexing\AncestorIndexer; use Ibexa\Contracts\Core\Persistence\Content\ContentInfo; use Ibexa\Contracts\Core\Persistence\Content\Handler as ContentHandler; use Ibexa\Contracts\Core\Persistence\Content\Location\Handler as LocationHandler; diff --git a/lib/Core/Search/Common/Messenger/MessageHandler/Search/ParentChildIndexing/Location/AssignSectionToSubtreeHandler.php b/lib/Core/Search/Common/Messenger/MessageHandler/Search/DescendantIndexing/Location/AssignSectionToSubtreeHandler.php similarity index 92% rename from lib/Core/Search/Common/Messenger/MessageHandler/Search/ParentChildIndexing/Location/AssignSectionToSubtreeHandler.php rename to lib/Core/Search/Common/Messenger/MessageHandler/Search/DescendantIndexing/Location/AssignSectionToSubtreeHandler.php index e9913bf2..ea3555ca 100644 --- a/lib/Core/Search/Common/Messenger/MessageHandler/Search/ParentChildIndexing/Location/AssignSectionToSubtreeHandler.php +++ b/lib/Core/Search/Common/Messenger/MessageHandler/Search/DescendantIndexing/Location/AssignSectionToSubtreeHandler.php @@ -2,9 +2,9 @@ declare(strict_types=1); -namespace Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\ParentChildIndexing\Location; +namespace Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\DescendantIndexing\Location; -use Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\ParentChildIndexing\AncestorIndexer; +use Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\DescendantIndexing\AncestorIndexer; use Ibexa\Contracts\Core\Persistence\Content\Location\Handler as LocationHandler; use Ibexa\Contracts\Core\Repository\Exceptions\NotFoundException; use Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\Message\Search\Location\AssignSectionToSubtree; diff --git a/lib/Core/Search/Common/Messenger/MessageHandler/Search/ParentChildIndexing/Location/CopySubtreeHandler.php b/lib/Core/Search/Common/Messenger/MessageHandler/Search/DescendantIndexing/Location/CopySubtreeHandler.php similarity index 92% rename from lib/Core/Search/Common/Messenger/MessageHandler/Search/ParentChildIndexing/Location/CopySubtreeHandler.php rename to lib/Core/Search/Common/Messenger/MessageHandler/Search/DescendantIndexing/Location/CopySubtreeHandler.php index fd4694ac..248ac6d1 100644 --- a/lib/Core/Search/Common/Messenger/MessageHandler/Search/ParentChildIndexing/Location/CopySubtreeHandler.php +++ b/lib/Core/Search/Common/Messenger/MessageHandler/Search/DescendantIndexing/Location/CopySubtreeHandler.php @@ -2,9 +2,9 @@ declare(strict_types=1); -namespace Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\ParentChildIndexing\Location; +namespace Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\DescendantIndexing\Location; -use Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\ParentChildIndexing\AncestorIndexer; +use Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\DescendantIndexing\AncestorIndexer; use Ibexa\Contracts\Core\Persistence\Content\Location\Handler as LocationHandler; use Ibexa\Contracts\Core\Repository\Exceptions\NotFoundException; use Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\Message\Search\Location\CopySubtree; diff --git a/lib/Core/Search/Common/Messenger/MessageHandler/Search/ParentChildIndexing/Location/CreateLocationHandler.php b/lib/Core/Search/Common/Messenger/MessageHandler/Search/DescendantIndexing/Location/CreateLocationHandler.php similarity index 92% rename from lib/Core/Search/Common/Messenger/MessageHandler/Search/ParentChildIndexing/Location/CreateLocationHandler.php rename to lib/Core/Search/Common/Messenger/MessageHandler/Search/DescendantIndexing/Location/CreateLocationHandler.php index 00e4f3f3..9da02cd7 100644 --- a/lib/Core/Search/Common/Messenger/MessageHandler/Search/ParentChildIndexing/Location/CreateLocationHandler.php +++ b/lib/Core/Search/Common/Messenger/MessageHandler/Search/DescendantIndexing/Location/CreateLocationHandler.php @@ -2,9 +2,9 @@ declare(strict_types=1); -namespace Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\ParentChildIndexing\Location; +namespace Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\DescendantIndexing\Location; -use Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\ParentChildIndexing\AncestorIndexer; +use Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\DescendantIndexing\AncestorIndexer; use Ibexa\Contracts\Core\Persistence\Content\Location\Handler as LocationHandler; use Ibexa\Contracts\Core\Repository\Exceptions\NotFoundException; use Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\Message\Search\Location\CreateLocation; diff --git a/lib/Core/Search/Common/Messenger/MessageHandler/Search/ParentChildIndexing/Location/DeleteLocationHandler.php b/lib/Core/Search/Common/Messenger/MessageHandler/Search/DescendantIndexing/Location/DeleteLocationHandler.php similarity index 92% rename from lib/Core/Search/Common/Messenger/MessageHandler/Search/ParentChildIndexing/Location/DeleteLocationHandler.php rename to lib/Core/Search/Common/Messenger/MessageHandler/Search/DescendantIndexing/Location/DeleteLocationHandler.php index 300fd175..d4acbcb1 100644 --- a/lib/Core/Search/Common/Messenger/MessageHandler/Search/ParentChildIndexing/Location/DeleteLocationHandler.php +++ b/lib/Core/Search/Common/Messenger/MessageHandler/Search/DescendantIndexing/Location/DeleteLocationHandler.php @@ -2,9 +2,9 @@ declare(strict_types=1); -namespace Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\ParentChildIndexing\Location; +namespace Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\DescendantIndexing\Location; -use Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\ParentChildIndexing\AncestorIndexer; +use Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\DescendantIndexing\AncestorIndexer; use Ibexa\Contracts\Core\Persistence\Content\Location\Handler as LocationHandler; use Ibexa\Contracts\Core\Repository\Exceptions\NotFoundException; use Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\Message\Search\Location\DeleteLocation; diff --git a/lib/Core/Search/Common/Messenger/MessageHandler/Search/ParentChildIndexing/Location/HideLocationHandler.php b/lib/Core/Search/Common/Messenger/MessageHandler/Search/DescendantIndexing/Location/HideLocationHandler.php similarity index 92% rename from lib/Core/Search/Common/Messenger/MessageHandler/Search/ParentChildIndexing/Location/HideLocationHandler.php rename to lib/Core/Search/Common/Messenger/MessageHandler/Search/DescendantIndexing/Location/HideLocationHandler.php index e4f08810..6667ab9c 100644 --- a/lib/Core/Search/Common/Messenger/MessageHandler/Search/ParentChildIndexing/Location/HideLocationHandler.php +++ b/lib/Core/Search/Common/Messenger/MessageHandler/Search/DescendantIndexing/Location/HideLocationHandler.php @@ -2,9 +2,9 @@ declare(strict_types=1); -namespace Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\ParentChildIndexing\Location; +namespace Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\DescendantIndexing\Location; -use Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\ParentChildIndexing\AncestorIndexer; +use Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\DescendantIndexing\AncestorIndexer; use Ibexa\Contracts\Core\Persistence\Content\Location\Handler as LocationHandler; use Ibexa\Contracts\Core\Repository\Exceptions\NotFoundException; use Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\Message\Search\Location\HideLocation; diff --git a/lib/Core/Search/Common/Messenger/MessageHandler/Search/ParentChildIndexing/Location/MoveSubtreeHandler.php b/lib/Core/Search/Common/Messenger/MessageHandler/Search/DescendantIndexing/Location/MoveSubtreeHandler.php similarity index 94% rename from lib/Core/Search/Common/Messenger/MessageHandler/Search/ParentChildIndexing/Location/MoveSubtreeHandler.php rename to lib/Core/Search/Common/Messenger/MessageHandler/Search/DescendantIndexing/Location/MoveSubtreeHandler.php index 516a403f..25bb35b5 100644 --- a/lib/Core/Search/Common/Messenger/MessageHandler/Search/ParentChildIndexing/Location/MoveSubtreeHandler.php +++ b/lib/Core/Search/Common/Messenger/MessageHandler/Search/DescendantIndexing/Location/MoveSubtreeHandler.php @@ -2,9 +2,9 @@ declare(strict_types=1); -namespace Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\ParentChildIndexing\Location; +namespace Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\DescendantIndexing\Location; -use Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\ParentChildIndexing\AncestorIndexer; +use Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\DescendantIndexing\AncestorIndexer; use Ibexa\Contracts\Core\Persistence\Content\Location\Handler as LocationHandler; use Ibexa\Contracts\Core\Repository\Exceptions\NotFoundException; use Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\Message\Search\Location\MoveSubtree; diff --git a/lib/Core/Search/Common/Messenger/MessageHandler/Search/ParentChildIndexing/Location/SwapLocationHandler.php b/lib/Core/Search/Common/Messenger/MessageHandler/Search/DescendantIndexing/Location/SwapLocationHandler.php similarity index 93% rename from lib/Core/Search/Common/Messenger/MessageHandler/Search/ParentChildIndexing/Location/SwapLocationHandler.php rename to lib/Core/Search/Common/Messenger/MessageHandler/Search/DescendantIndexing/Location/SwapLocationHandler.php index ae039193..db06ec37 100644 --- a/lib/Core/Search/Common/Messenger/MessageHandler/Search/ParentChildIndexing/Location/SwapLocationHandler.php +++ b/lib/Core/Search/Common/Messenger/MessageHandler/Search/DescendantIndexing/Location/SwapLocationHandler.php @@ -2,9 +2,9 @@ declare(strict_types=1); -namespace Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\ParentChildIndexing\Location; +namespace Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\DescendantIndexing\Location; -use Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\ParentChildIndexing\AncestorIndexer; +use Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\DescendantIndexing\AncestorIndexer; use Ibexa\Contracts\Core\Persistence\Content\Location\Handler as LocationHandler; use Ibexa\Contracts\Core\Repository\Exceptions\NotFoundException; use Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\Message\Search\Location\SwapLocation; diff --git a/lib/Core/Search/Common/Messenger/MessageHandler/Search/ParentChildIndexing/Location/UnhideLocationHandler.php b/lib/Core/Search/Common/Messenger/MessageHandler/Search/DescendantIndexing/Location/UnhideLocationHandler.php similarity index 92% rename from lib/Core/Search/Common/Messenger/MessageHandler/Search/ParentChildIndexing/Location/UnhideLocationHandler.php rename to lib/Core/Search/Common/Messenger/MessageHandler/Search/DescendantIndexing/Location/UnhideLocationHandler.php index 69dc00c9..06df3be7 100644 --- a/lib/Core/Search/Common/Messenger/MessageHandler/Search/ParentChildIndexing/Location/UnhideLocationHandler.php +++ b/lib/Core/Search/Common/Messenger/MessageHandler/Search/DescendantIndexing/Location/UnhideLocationHandler.php @@ -2,9 +2,9 @@ declare(strict_types=1); -namespace Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\ParentChildIndexing\Location; +namespace Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\DescendantIndexing\Location; -use Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\ParentChildIndexing\AncestorIndexer; +use Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\DescendantIndexing\AncestorIndexer; use Ibexa\Contracts\Core\Persistence\Content\Location\Handler as LocationHandler; use Ibexa\Contracts\Core\Repository\Exceptions\NotFoundException; use Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\Message\Search\Location\UnhideLocation; diff --git a/lib/Core/Search/Common/Messenger/MessageHandler/Search/ParentChildIndexing/Location/UpdateLocationHandler.php b/lib/Core/Search/Common/Messenger/MessageHandler/Search/DescendantIndexing/Location/UpdateLocationHandler.php similarity index 92% rename from lib/Core/Search/Common/Messenger/MessageHandler/Search/ParentChildIndexing/Location/UpdateLocationHandler.php rename to lib/Core/Search/Common/Messenger/MessageHandler/Search/DescendantIndexing/Location/UpdateLocationHandler.php index 92a76f98..0f19d78e 100644 --- a/lib/Core/Search/Common/Messenger/MessageHandler/Search/ParentChildIndexing/Location/UpdateLocationHandler.php +++ b/lib/Core/Search/Common/Messenger/MessageHandler/Search/DescendantIndexing/Location/UpdateLocationHandler.php @@ -2,9 +2,9 @@ declare(strict_types=1); -namespace Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\ParentChildIndexing\Location; +namespace Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\DescendantIndexing\Location; -use Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\ParentChildIndexing\AncestorIndexer; +use Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\DescendantIndexing\AncestorIndexer; use Ibexa\Contracts\Core\Persistence\Content\Location\Handler as LocationHandler; use Ibexa\Contracts\Core\Repository\Exceptions\NotFoundException; use Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\Message\Search\Location\UpdateLocation; diff --git a/lib/Core/Search/Common/Messenger/MessageHandler/Search/ParentChildIndexing/ObjectState/SetContentStateHandler.php b/lib/Core/Search/Common/Messenger/MessageHandler/Search/DescendantIndexing/ObjectState/SetContentStateHandler.php similarity index 88% rename from lib/Core/Search/Common/Messenger/MessageHandler/Search/ParentChildIndexing/ObjectState/SetContentStateHandler.php rename to lib/Core/Search/Common/Messenger/MessageHandler/Search/DescendantIndexing/ObjectState/SetContentStateHandler.php index bee8711b..bda806ba 100644 --- a/lib/Core/Search/Common/Messenger/MessageHandler/Search/ParentChildIndexing/ObjectState/SetContentStateHandler.php +++ b/lib/Core/Search/Common/Messenger/MessageHandler/Search/DescendantIndexing/ObjectState/SetContentStateHandler.php @@ -2,9 +2,9 @@ declare(strict_types=1); -namespace Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\ParentChildIndexing\ObjectState; +namespace Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\DescendantIndexing\ObjectState; -use Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\ParentChildIndexing\AncestorIndexer; +use Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\DescendantIndexing\AncestorIndexer; use Ibexa\Contracts\Core\Persistence\Content\Location\Handler as LocationHandler; use Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\Message\Search\ObjectState\SetContentState; diff --git a/lib/Core/Search/Common/Messenger/MessageHandler/Search/ParentChildIndexing/Section/AssignSectionHandler.php b/lib/Core/Search/Common/Messenger/MessageHandler/Search/DescendantIndexing/Section/AssignSectionHandler.php similarity index 88% rename from lib/Core/Search/Common/Messenger/MessageHandler/Search/ParentChildIndexing/Section/AssignSectionHandler.php rename to lib/Core/Search/Common/Messenger/MessageHandler/Search/DescendantIndexing/Section/AssignSectionHandler.php index df1ad48b..30adea80 100644 --- a/lib/Core/Search/Common/Messenger/MessageHandler/Search/ParentChildIndexing/Section/AssignSectionHandler.php +++ b/lib/Core/Search/Common/Messenger/MessageHandler/Search/DescendantIndexing/Section/AssignSectionHandler.php @@ -2,9 +2,9 @@ declare(strict_types=1); -namespace Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\ParentChildIndexing\Section; +namespace Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\DescendantIndexing\Section; -use Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\ParentChildIndexing\AncestorIndexer; +use Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\DescendantIndexing\AncestorIndexer; use Ibexa\Contracts\Core\Persistence\Content\Location\Handler as LocationHandler; use Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\Message\Search\Section\AssignSection; diff --git a/lib/Core/Search/Common/Messenger/MessageHandler/Search/ParentChildIndexing/Trash/RecoverHandler.php b/lib/Core/Search/Common/Messenger/MessageHandler/Search/DescendantIndexing/Trash/RecoverHandler.php similarity index 92% rename from lib/Core/Search/Common/Messenger/MessageHandler/Search/ParentChildIndexing/Trash/RecoverHandler.php rename to lib/Core/Search/Common/Messenger/MessageHandler/Search/DescendantIndexing/Trash/RecoverHandler.php index 93f49e73..daf94c13 100644 --- a/lib/Core/Search/Common/Messenger/MessageHandler/Search/ParentChildIndexing/Trash/RecoverHandler.php +++ b/lib/Core/Search/Common/Messenger/MessageHandler/Search/DescendantIndexing/Trash/RecoverHandler.php @@ -2,9 +2,9 @@ declare(strict_types=1); -namespace Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\ParentChildIndexing\Trash; +namespace Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\DescendantIndexing\Trash; -use Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\ParentChildIndexing\AncestorIndexer; +use Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\DescendantIndexing\AncestorIndexer; use Ibexa\Contracts\Core\Persistence\Content\Location\Handler as LocationHandler; use Ibexa\Contracts\Core\Repository\Exceptions\NotFoundException; use Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\Message\Search\Trash\Recover; diff --git a/lib/Core/Search/Common/Messenger/MessageHandler/Search/ParentChildIndexing/Trash/TrashHandler.php b/lib/Core/Search/Common/Messenger/MessageHandler/Search/DescendantIndexing/Trash/TrashHandler.php similarity index 93% rename from lib/Core/Search/Common/Messenger/MessageHandler/Search/ParentChildIndexing/Trash/TrashHandler.php rename to lib/Core/Search/Common/Messenger/MessageHandler/Search/DescendantIndexing/Trash/TrashHandler.php index 48336671..5a994bf6 100644 --- a/lib/Core/Search/Common/Messenger/MessageHandler/Search/ParentChildIndexing/Trash/TrashHandler.php +++ b/lib/Core/Search/Common/Messenger/MessageHandler/Search/DescendantIndexing/Trash/TrashHandler.php @@ -2,10 +2,10 @@ declare(strict_types=1); -namespace Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\ParentChildIndexing\Trash; +namespace Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\DescendantIndexing\Trash; use Ibexa\Contracts\Core\Persistence\Content\Location; -use Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\ParentChildIndexing\AncestorIndexer; +use Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\DescendantIndexing\AncestorIndexer; use Ibexa\Contracts\Core\Persistence\Content\Location\Handler as LocationHandler; use Ibexa\Contracts\Core\Repository\Exceptions\NotFoundException; use Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\Message\Search\Trash\Trash; diff --git a/lib/Core/Search/Solr/FieldMapper/Content/ParentChildFieldMapper.php b/lib/Core/Search/Solr/FieldMapper/Content/DescendantFieldMapper.php similarity index 88% rename from lib/Core/Search/Solr/FieldMapper/Content/ParentChildFieldMapper.php rename to lib/Core/Search/Solr/FieldMapper/Content/DescendantFieldMapper.php index f3af98cf..51cd53eb 100644 --- a/lib/Core/Search/Solr/FieldMapper/Content/ParentChildFieldMapper.php +++ b/lib/Core/Search/Solr/FieldMapper/Content/DescendantFieldMapper.php @@ -6,14 +6,14 @@ use Ibexa\Contracts\Core\Persistence\Content; use Ibexa\Contracts\Solr\FieldMapper\ContentFieldMapper; -use Netgen\IbexaSearchExtra\Core\Search\Solr\FieldMapper\Content\ParentChildFieldMapper\BaseFieldMapper; +use Netgen\IbexaSearchExtra\Core\Search\Solr\FieldMapper\Content\DescendantFieldMapper\BaseFieldMapper; use function array_merge; -final class ParentChildFieldMapper extends ContentFieldMapper +final class DescendantFieldMapper extends ContentFieldMapper { /** - * @param \Netgen\IbexaSearchExtra\Core\Search\Solr\FieldMapper\Content\ParentChildFieldMapper\BaseFieldMapper[] $fieldMappers + * @param \Netgen\IbexaSearchExtra\Core\Search\Solr\FieldMapper\Content\DescendantFieldMapper\BaseFieldMapper[] $fieldMappers */ public function __construct( private readonly array $configuration, diff --git a/lib/Core/Search/Solr/FieldMapper/Content/ParentChildFieldMapper/BaseFieldMapper.php b/lib/Core/Search/Solr/FieldMapper/Content/DescendantFieldMapper/BaseFieldMapper.php similarity index 97% rename from lib/Core/Search/Solr/FieldMapper/Content/ParentChildFieldMapper/BaseFieldMapper.php rename to lib/Core/Search/Solr/FieldMapper/Content/DescendantFieldMapper/BaseFieldMapper.php index dcdd5025..8b5712d4 100644 --- a/lib/Core/Search/Solr/FieldMapper/Content/ParentChildFieldMapper/BaseFieldMapper.php +++ b/lib/Core/Search/Solr/FieldMapper/Content/DescendantFieldMapper/BaseFieldMapper.php @@ -3,7 +3,7 @@ declare(strict_types=1); -namespace Netgen\IbexaSearchExtra\Core\Search\Solr\FieldMapper\Content\ParentChildFieldMapper; +namespace Netgen\IbexaSearchExtra\Core\Search\Solr\FieldMapper\Content\DescendantFieldMapper; use Ibexa\Contracts\Core\Persistence\Content; use Ibexa\Contracts\Core\Persistence\Content\Type\Handler as ContentTypeHandler; diff --git a/lib/Core/Search/Solr/FieldMapper/ContentTranslation/ParentChildFieldMapper.php b/lib/Core/Search/Solr/FieldMapper/ContentTranslation/DescendantFieldMapper.php similarity index 87% rename from lib/Core/Search/Solr/FieldMapper/ContentTranslation/ParentChildFieldMapper.php rename to lib/Core/Search/Solr/FieldMapper/ContentTranslation/DescendantFieldMapper.php index c5b36f0f..aec82d0b 100644 --- a/lib/Core/Search/Solr/FieldMapper/ContentTranslation/ParentChildFieldMapper.php +++ b/lib/Core/Search/Solr/FieldMapper/ContentTranslation/DescendantFieldMapper.php @@ -6,14 +6,14 @@ use Ibexa\Contracts\Core\Persistence\Content; use Ibexa\Contracts\Solr\FieldMapper\ContentTranslationFieldMapper; -use Netgen\IbexaSearchExtra\Core\Search\Solr\FieldMapper\ContentTranslation\ParentChildFieldMapper\BaseFieldMapper; +use Netgen\IbexaSearchExtra\Core\Search\Solr\FieldMapper\ContentTranslation\DescendantFieldMapper\BaseFieldMapper; use function array_merge; -final class ParentChildFieldMapper extends ContentTranslationFieldMapper +final class DescendantFieldMapper extends ContentTranslationFieldMapper { /** - * @param \Netgen\IbexaSearchExtra\Core\Search\Solr\FieldMapper\ContentTranslation\ParentChildFieldMapper\BaseFieldMapper[] $fieldMappers + * @param \Netgen\IbexaSearchExtra\Core\Search\Solr\FieldMapper\ContentTranslation\DescendantFieldMapper\BaseFieldMapper[] $fieldMappers */ public function __construct( private readonly array $configuration, diff --git a/lib/Core/Search/Solr/FieldMapper/ContentTranslation/ParentChildFieldMapper/BaseFieldMapper.php b/lib/Core/Search/Solr/FieldMapper/ContentTranslation/DescendantFieldMapper/BaseFieldMapper.php similarity index 97% rename from lib/Core/Search/Solr/FieldMapper/ContentTranslation/ParentChildFieldMapper/BaseFieldMapper.php rename to lib/Core/Search/Solr/FieldMapper/ContentTranslation/DescendantFieldMapper/BaseFieldMapper.php index 4a7ff4e2..a89c5c8f 100644 --- a/lib/Core/Search/Solr/FieldMapper/ContentTranslation/ParentChildFieldMapper/BaseFieldMapper.php +++ b/lib/Core/Search/Solr/FieldMapper/ContentTranslation/DescendantFieldMapper/BaseFieldMapper.php @@ -3,7 +3,7 @@ declare(strict_types=1); -namespace Netgen\IbexaSearchExtra\Core\Search\Solr\FieldMapper\ContentTranslation\ParentChildFieldMapper; +namespace Netgen\IbexaSearchExtra\Core\Search\Solr\FieldMapper\ContentTranslation\DescendantFieldMapper; use Ibexa\Contracts\Core\Persistence\Content; use Ibexa\Contracts\Core\Persistence\Content\Type\Handler as ContentTypeHandler; diff --git a/lib/Core/Search/Solr/FieldMapper/ContentTranslation/ParentChildFieldMapper/FullTextFieldMapper.php b/lib/Core/Search/Solr/FieldMapper/ContentTranslation/DescendantFieldMapper/FullTextFieldMapper.php similarity index 98% rename from lib/Core/Search/Solr/FieldMapper/ContentTranslation/ParentChildFieldMapper/FullTextFieldMapper.php rename to lib/Core/Search/Solr/FieldMapper/ContentTranslation/DescendantFieldMapper/FullTextFieldMapper.php index 4d9c2f4d..e8829d46 100644 --- a/lib/Core/Search/Solr/FieldMapper/ContentTranslation/ParentChildFieldMapper/FullTextFieldMapper.php +++ b/lib/Core/Search/Solr/FieldMapper/ContentTranslation/DescendantFieldMapper/FullTextFieldMapper.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace Netgen\IbexaSearchExtra\Core\Search\Solr\FieldMapper\ContentTranslation\ParentChildFieldMapper; +namespace Netgen\IbexaSearchExtra\Core\Search\Solr\FieldMapper\ContentTranslation\DescendantFieldMapper; use Ibexa\Contracts\Core\Persistence\Content as SPIContent; use Ibexa\Contracts\Core\Persistence\Content\ContentInfo; @@ -18,7 +18,7 @@ use Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion\ParentLocationId; use Ibexa\Contracts\Core\Repository\Values\Filter\Filter; use Ibexa\Contracts\Solr\FieldMapper\ContentTranslationFieldMapper; -use Netgen\IbexaSearchExtra\Core\Search\Solr\FieldMapper\ContentTranslation\ParentChildFieldMapper\FullTextFieldResolver; +use Netgen\IbexaSearchExtra\Core\Search\Solr\FieldMapper\ContentTranslation\DescendantFieldMapper\FullTextFieldResolver; use Netgen\IbexaSearchExtra\Core\Search\Solr\FieldMapper\IdentifiableFieldMapper; use function array_key_exists; diff --git a/lib/Core/Search/Solr/FieldMapper/ContentTranslation/ParentChildFieldMapper/FullTextFieldResolver.php b/lib/Core/Search/Solr/FieldMapper/ContentTranslation/DescendantFieldMapper/FullTextFieldResolver.php similarity index 89% rename from lib/Core/Search/Solr/FieldMapper/ContentTranslation/ParentChildFieldMapper/FullTextFieldResolver.php rename to lib/Core/Search/Solr/FieldMapper/ContentTranslation/DescendantFieldMapper/FullTextFieldResolver.php index 8a81e3ef..46d82bea 100644 --- a/lib/Core/Search/Solr/FieldMapper/ContentTranslation/ParentChildFieldMapper/FullTextFieldResolver.php +++ b/lib/Core/Search/Solr/FieldMapper/ContentTranslation/DescendantFieldMapper/FullTextFieldResolver.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace Netgen\IbexaSearchExtra\Core\Search\Solr\FieldMapper\ContentTranslation\ParentChildFieldMapper; +namespace Netgen\IbexaSearchExtra\Core\Search\Solr\FieldMapper\ContentTranslation\DescendantFieldMapper; use Ibexa\Contracts\Core\Persistence\Content as SPIContent; diff --git a/lib/Core/Search/Solr/FieldMapper/ContentTranslation/ParentChildFieldMapper/FullTextFieldResolver/NativeFullTextFieldResolver.php b/lib/Core/Search/Solr/FieldMapper/ContentTranslation/DescendantFieldMapper/FullTextFieldResolver/NativeFullTextFieldResolver.php similarity index 95% rename from lib/Core/Search/Solr/FieldMapper/ContentTranslation/ParentChildFieldMapper/FullTextFieldResolver/NativeFullTextFieldResolver.php rename to lib/Core/Search/Solr/FieldMapper/ContentTranslation/DescendantFieldMapper/FullTextFieldResolver/NativeFullTextFieldResolver.php index 1cc8dc85..5633b664 100644 --- a/lib/Core/Search/Solr/FieldMapper/ContentTranslation/ParentChildFieldMapper/FullTextFieldResolver/NativeFullTextFieldResolver.php +++ b/lib/Core/Search/Solr/FieldMapper/ContentTranslation/DescendantFieldMapper/FullTextFieldResolver/NativeFullTextFieldResolver.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace Netgen\IbexaSearchExtra\Core\Search\Solr\FieldMapper\ContentTranslation\ParentChildFieldMapper\FullTextFieldResolver; +namespace Netgen\IbexaSearchExtra\Core\Search\Solr\FieldMapper\ContentTranslation\DescendantFieldMapper\FullTextFieldResolver; use Ibexa\Contracts\Core\Persistence\Content as SPIContent; use Ibexa\Contracts\Core\Persistence\Content\Type\Handler as ContentTypeHandler; @@ -11,7 +11,7 @@ use Ibexa\Contracts\Core\Search\FieldType\FullTextField; use Ibexa\Contracts\Core\Search\FieldType\TextField; use Ibexa\Core\Search\Common\FieldRegistry; -use Netgen\IbexaSearchExtra\Core\Search\Solr\FieldMapper\ContentTranslation\ParentChildFieldMapper\FullTextFieldResolver; +use Netgen\IbexaSearchExtra\Core\Search\Solr\FieldMapper\ContentTranslation\DescendantFieldMapper\FullTextFieldResolver; final class NativeFullTextFieldResolver implements FullTextFieldResolver { diff --git a/lib/Core/Search/Solr/FieldMapper/Location/ParentChildFieldMapper.php b/lib/Core/Search/Solr/FieldMapper/Location/DescendantFieldMapper.php similarity index 88% rename from lib/Core/Search/Solr/FieldMapper/Location/ParentChildFieldMapper.php rename to lib/Core/Search/Solr/FieldMapper/Location/DescendantFieldMapper.php index cab690fe..590d3dbf 100644 --- a/lib/Core/Search/Solr/FieldMapper/Location/ParentChildFieldMapper.php +++ b/lib/Core/Search/Solr/FieldMapper/Location/DescendantFieldMapper.php @@ -6,14 +6,14 @@ use Ibexa\Contracts\Core\Persistence\Content\Location; use Ibexa\Contracts\Solr\FieldMapper\LocationFieldMapper; -use Netgen\IbexaSearchExtra\Core\Search\Solr\FieldMapper\Location\ParentChildFieldMapper\BaseFieldMapper; +use Netgen\IbexaSearchExtra\Core\Search\Solr\FieldMapper\Location\DescendantFieldMapper\BaseFieldMapper; use function array_merge; -final class ParentChildFieldMapper extends LocationFieldMapper +final class DescendantFieldMapper extends LocationFieldMapper { /** - * @param \Netgen\IbexaSearchExtra\Core\Search\Solr\FieldMapper\Location\ParentChildFieldMapper\BaseFieldMapper[] $fieldMappers + * @param \Netgen\IbexaSearchExtra\Core\Search\Solr\FieldMapper\Location\DescendantFieldMapper\BaseFieldMapper[] $fieldMappers */ public function __construct( private readonly array $configuration, diff --git a/lib/Core/Search/Solr/FieldMapper/Location/ParentChildFieldMapper/BaseFieldMapper.php b/lib/Core/Search/Solr/FieldMapper/Location/DescendantFieldMapper/BaseFieldMapper.php similarity index 98% rename from lib/Core/Search/Solr/FieldMapper/Location/ParentChildFieldMapper/BaseFieldMapper.php rename to lib/Core/Search/Solr/FieldMapper/Location/DescendantFieldMapper/BaseFieldMapper.php index 5e5c4e1d..09847718 100644 --- a/lib/Core/Search/Solr/FieldMapper/Location/ParentChildFieldMapper/BaseFieldMapper.php +++ b/lib/Core/Search/Solr/FieldMapper/Location/DescendantFieldMapper/BaseFieldMapper.php @@ -3,7 +3,7 @@ declare(strict_types=1); -namespace Netgen\IbexaSearchExtra\Core\Search\Solr\FieldMapper\Location\ParentChildFieldMapper; +namespace Netgen\IbexaSearchExtra\Core\Search\Solr\FieldMapper\Location\DescendantFieldMapper; use Ibexa\Contracts\Core\Persistence\Content\Location; use Ibexa\Contracts\Core\Persistence\Content\Handler as ContentHandler; diff --git a/lib/Resources/config/search/common/descendant_indexing/common.yaml b/lib/Resources/config/search/common/descendant_indexing/common.yaml index 8ab12554..7fdb828f 100644 --- a/lib/Resources/config/search/common/descendant_indexing/common.yaml +++ b/lib/Resources/config/search/common/descendant_indexing/common.yaml @@ -1,11 +1,11 @@ services: netgen.ibexa_search_extra.descendant_indexing.ancestor_path_generator: - class: Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\ParentChildIndexing\AncestorPathGenerator + class: Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\DescendantIndexing\AncestorPathGenerator arguments: - '%netgen.ibexa_search_extra.descendant_indexing.configuration%' netgen.ibexa_search_extra.descendant_indexing.ancestor_resolver: - class: Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\ParentChildIndexing\AncestorResolver + class: Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\DescendantIndexing\AncestorResolver arguments: - '@Ibexa\Core\Persistence\Legacy\Content\Handler' - '@Ibexa\Contracts\Core\Persistence\Content\Type\Handler' @@ -13,7 +13,7 @@ services: - '@netgen.ibexa_search_extra.descendant_indexing.ancestor_path_generator' netgen.ibexa_search_extra.descendant_indexing.ancestor_indexer: - class: Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\ParentChildIndexing\AncestorIndexer + class: Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\DescendantIndexing\AncestorIndexer arguments: - '@Ibexa\Contracts\Core\Search\VersatileHandler' - '@Ibexa\Core\Persistence\Legacy\Content\Handler' diff --git a/lib/Resources/config/search/common/descendant_indexing/content.yaml b/lib/Resources/config/search/common/descendant_indexing/content.yaml index 6c379d82..50f1eb57 100644 --- a/lib/Resources/config/search/common/descendant_indexing/content.yaml +++ b/lib/Resources/config/search/common/descendant_indexing/content.yaml @@ -1,6 +1,6 @@ services: netgen.ibexa_search_extra.descendant_indexing.message_handler.copy_content: - class: Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\ParentChildIndexing\Content\CopyContentHandler + class: Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\DescendantIndexing\Content\CopyContentHandler arguments: - '@Ibexa\Contracts\Core\Persistence\Content\Location\Handler' - '@netgen.ibexa_search_extra.descendant_indexing.ancestor_indexer' @@ -8,7 +8,7 @@ services: - { name: netgen.ibexa_search_extra.descendant_indexing.message_handler } netgen.ibexa_search_extra.descendant_indexing.message_handler.delete_content: - class: Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\ParentChildIndexing\Content\DeleteContentHandler + class: Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\DescendantIndexing\Content\DeleteContentHandler arguments: - '@Ibexa\Contracts\Core\Persistence\Content\Location\Handler' - '@netgen.ibexa_search_extra.descendant_indexing.ancestor_indexer' @@ -18,7 +18,7 @@ services: - { name: monolog.logger, channel: ngsearchextra } netgen.ibexa_search_extra.descendant_indexing.message_handler.delete_translation: - class: Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\ParentChildIndexing\Content\DeleteTranslationHandler + class: Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\DescendantIndexing\Content\DeleteTranslationHandler arguments: - '@Ibexa\Contracts\Core\Persistence\Content\Handler' - '@Ibexa\Contracts\Core\Persistence\Content\Location\Handler' @@ -29,7 +29,7 @@ services: - { name: monolog.logger, channel: ngsearchextra } netgen.ibexa_search_extra.descendant_indexing.message_handler.hide_content: - class: Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\ParentChildIndexing\Content\HideContentHandler + class: Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\DescendantIndexing\Content\HideContentHandler arguments: - '@Ibexa\Contracts\Core\Persistence\Content\Location\Handler' - '@netgen.ibexa_search_extra.descendant_indexing.ancestor_indexer' @@ -37,7 +37,7 @@ services: - { name: netgen.ibexa_search_extra.descendant_indexing.message_handler } netgen.ibexa_search_extra.descendant_indexing.message_handler.publish_version: - class: Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\ParentChildIndexing\Content\PublishVersionHandler + class: Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\DescendantIndexing\Content\PublishVersionHandler arguments: - '@Ibexa\Contracts\Core\Persistence\Content\Location\Handler' - '@netgen.ibexa_search_extra.descendant_indexing.ancestor_indexer' @@ -45,7 +45,7 @@ services: - { name: netgen.ibexa_search_extra.descendant_indexing.message_handler } netgen.ibexa_search_extra.descendant_indexing.message_handler.reveal_content: - class: Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\ParentChildIndexing\Content\RevealContentHandler + class: Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\DescendantIndexing\Content\RevealContentHandler arguments: - '@Ibexa\Contracts\Core\Persistence\Content\Location\Handler' - '@netgen.ibexa_search_extra.descendant_indexing.ancestor_indexer' @@ -53,7 +53,7 @@ services: - { name: netgen.ibexa_search_extra.descendant_indexing.message_handler } netgen.ibexa_search_extra.descendant_indexing.message_handler.update_content_metadata: - class: Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\ParentChildIndexing\Content\UpdateContentMetadataHandler + class: Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\DescendantIndexing\Content\UpdateContentMetadataHandler arguments: - '@Ibexa\Contracts\Core\Persistence\Content\Handler' - '@Ibexa\Contracts\Core\Persistence\Content\Location\Handler' diff --git a/lib/Resources/config/search/common/descendant_indexing/location.yaml b/lib/Resources/config/search/common/descendant_indexing/location.yaml index a79ad0a8..dab92d9d 100644 --- a/lib/Resources/config/search/common/descendant_indexing/location.yaml +++ b/lib/Resources/config/search/common/descendant_indexing/location.yaml @@ -1,6 +1,6 @@ services: netgen.ibexa_search_extra.descendant_indexing.message_handler.assign_section_to_subtree: - class: Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\ParentChildIndexing\Location\AssignSectionToSubtreeHandler + class: Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\DescendantIndexing\Location\AssignSectionToSubtreeHandler arguments: - '@Ibexa\Contracts\Core\Persistence\Content\Location\Handler' - '@netgen.ibexa_search_extra.descendant_indexing.ancestor_indexer' @@ -10,7 +10,7 @@ services: - { name: monolog.logger, channel: ngsearchextra } netgen.ibexa_search_extra.descendant_indexing.message_handler.copy_subtree: - class: Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\ParentChildIndexing\Location\CopySubtreeHandler + class: Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\DescendantIndexing\Location\CopySubtreeHandler arguments: - '@Ibexa\Contracts\Core\Persistence\Content\Location\Handler' - '@netgen.ibexa_search_extra.descendant_indexing.ancestor_indexer' @@ -20,7 +20,7 @@ services: - { name: monolog.logger, channel: ngsearchextra } netgen.ibexa_search_extra.descendant_indexing.message_handler.create_location: - class: Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\ParentChildIndexing\Location\CreateLocationHandler + class: Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\DescendantIndexing\Location\CreateLocationHandler arguments: - '@Ibexa\Contracts\Core\Persistence\Content\Location\Handler' - '@netgen.ibexa_search_extra.descendant_indexing.ancestor_indexer' @@ -30,7 +30,7 @@ services: - { name: monolog.logger, channel: ngsearchextra } netgen.ibexa_search_extra.descendant_indexing.message_handler.delete_location: - class: Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\ParentChildIndexing\Location\DeleteLocationHandler + class: Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\DescendantIndexing\Location\DeleteLocationHandler arguments: - '@Ibexa\Contracts\Core\Persistence\Content\Location\Handler' - '@netgen.ibexa_search_extra.descendant_indexing.ancestor_indexer' @@ -40,7 +40,7 @@ services: - { name: monolog.logger, channel: ngsearchextra } netgen.ibexa_search_extra.descendant_indexing.message_handler.hide_location: - class: Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\ParentChildIndexing\Location\HideLocationHandler + class: Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\DescendantIndexing\Location\HideLocationHandler arguments: - '@Ibexa\Contracts\Core\Persistence\Content\Location\Handler' - '@netgen.ibexa_search_extra.descendant_indexing.ancestor_indexer' @@ -50,7 +50,7 @@ services: - { name: monolog.logger, channel: ngsearchextra } netgen.ibexa_search_extra.descendant_indexing.message_handler.move_subtree: - class: Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\ParentChildIndexing\Location\MoveSubtreeHandler + class: Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\DescendantIndexing\Location\MoveSubtreeHandler arguments: - '@Ibexa\Contracts\Core\Persistence\Content\Location\Handler' - '@netgen.ibexa_search_extra.descendant_indexing.ancestor_indexer' @@ -60,7 +60,7 @@ services: - { name: monolog.logger, channel: ngsearchextra } netgen.ibexa_search_extra.descendant_indexing.message_handler.swap_location: - class: Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\ParentChildIndexing\Location\SwapLocationHandler + class: Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\DescendantIndexing\Location\SwapLocationHandler arguments: - '@Ibexa\Contracts\Core\Persistence\Content\Location\Handler' - '@netgen.ibexa_search_extra.descendant_indexing.ancestor_indexer' @@ -70,7 +70,7 @@ services: - { name: monolog.logger, channel: ngsearchextra } netgen.ibexa_search_extra.descendant_indexing.message_handler.unhide_location: - class: Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\ParentChildIndexing\Location\UnhideLocationHandler + class: Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\DescendantIndexing\Location\UnhideLocationHandler arguments: - '@Ibexa\Contracts\Core\Persistence\Content\Location\Handler' - '@netgen.ibexa_search_extra.descendant_indexing.ancestor_indexer' @@ -80,7 +80,7 @@ services: - { name: monolog.logger, channel: ngsearchextra } netgen.ibexa_search_extra.descendant_indexing.message_handler.update_location: - class: Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\ParentChildIndexing\Location\UpdateLocationHandler + class: Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\DescendantIndexing\Location\UpdateLocationHandler arguments: - '@Ibexa\Contracts\Core\Persistence\Content\Location\Handler' - '@netgen.ibexa_search_extra.descendant_indexing.ancestor_indexer' diff --git a/lib/Resources/config/search/common/descendant_indexing/object_state.yaml b/lib/Resources/config/search/common/descendant_indexing/object_state.yaml index 0838d3af..bf196e77 100644 --- a/lib/Resources/config/search/common/descendant_indexing/object_state.yaml +++ b/lib/Resources/config/search/common/descendant_indexing/object_state.yaml @@ -1,6 +1,6 @@ services: netgen.ibexa_search_extra.descendant_indexing.message_handler.set_content_state: - class: Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\ParentChildIndexing\ObjectState\SetContentStateHandler + class: Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\DescendantIndexing\ObjectState\SetContentStateHandler arguments: - '@Ibexa\Contracts\Core\Persistence\Content\Location\Handler' - '@netgen.ibexa_search_extra.descendant_indexing.ancestor_indexer' diff --git a/lib/Resources/config/search/common/descendant_indexing/section.yaml b/lib/Resources/config/search/common/descendant_indexing/section.yaml index 72bfbedc..64c05099 100644 --- a/lib/Resources/config/search/common/descendant_indexing/section.yaml +++ b/lib/Resources/config/search/common/descendant_indexing/section.yaml @@ -1,6 +1,6 @@ services: netgen.ibexa_search_extra.descendant_indexing.message_handler.assign_section: - class: Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\ParentChildIndexing\Section\AssignSectionHandler + class: Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\DescendantIndexing\Section\AssignSectionHandler arguments: - '@Ibexa\Contracts\Core\Persistence\Content\Location\Handler' - '@netgen.ibexa_search_extra.descendant_indexing.ancestor_indexer' diff --git a/lib/Resources/config/search/common/descendant_indexing/trash.yaml b/lib/Resources/config/search/common/descendant_indexing/trash.yaml index b6e0a9b2..2a4fdbf2 100644 --- a/lib/Resources/config/search/common/descendant_indexing/trash.yaml +++ b/lib/Resources/config/search/common/descendant_indexing/trash.yaml @@ -1,6 +1,6 @@ services: netgen.ibexa_search_extra.descendant_indexing.message_handler.recover: - class: Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\ParentChildIndexing\Trash\RecoverHandler + class: Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\DescendantIndexing\Trash\RecoverHandler arguments: - '@Ibexa\Contracts\Core\Persistence\Content\Location\Handler' - '@netgen.ibexa_search_extra.descendant_indexing.ancestor_indexer' @@ -10,7 +10,7 @@ services: - { name: monolog.logger, channel: ngsearchextra } netgen.ibexa_search_extra.descendant_indexing.message_handler.trash: - class: Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\ParentChildIndexing\Trash\TrashHandler + class: Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\DescendantIndexing\Trash\TrashHandler arguments: - '@Ibexa\Contracts\Core\Persistence\Content\Location\Handler' - '@netgen.ibexa_search_extra.descendant_indexing.ancestor_indexer' diff --git a/lib/Resources/config/search/solr/descendant_indexing/field_mappers.yaml b/lib/Resources/config/search/solr/descendant_indexing/field_mappers.yaml index 69e0d60c..a1b7a4f4 100644 --- a/lib/Resources/config/search/solr/descendant_indexing/field_mappers.yaml +++ b/lib/Resources/config/search/solr/descendant_indexing/field_mappers.yaml @@ -1,27 +1,27 @@ services: netgen.ibexa_search_extra.solr.field_mapper.descendant_indexing.content: - class: Netgen\IbexaSearchExtra\Core\Search\Solr\FieldMapper\Content\ParentChildFieldMapper + class: Netgen\IbexaSearchExtra\Core\Search\Solr\FieldMapper\Content\DescendantFieldMapper arguments: - '%netgen.ibexa_search_extra.descendant_indexing.configuration%' tags: - { name: ibexa.search.solr.field.mapper.content } netgen.ibexa_search_extra.solr.field_mapper.descendant_indexing.content.translation: - class: Netgen\IbexaSearchExtra\Core\Search\Solr\FieldMapper\ContentTranslation\ParentChildFieldMapper + class: Netgen\IbexaSearchExtra\Core\Search\Solr\FieldMapper\ContentTranslation\DescendantFieldMapper arguments: - '%netgen.ibexa_search_extra.descendant_indexing.configuration%' tags: - { name: ibexa.search.solr.field.mapper.content.translation } netgen.ibexa_search_extra.solr.field_mapper.descendant_indexing.location: - class: Netgen\IbexaSearchExtra\Core\Search\Solr\FieldMapper\Location\ParentChildFieldMapper + class: Netgen\IbexaSearchExtra\Core\Search\Solr\FieldMapper\Location\DescendantFieldMapper arguments: - '%netgen.ibexa_search_extra.descendant_indexing.configuration%' tags: - { name: ibexa.search.solr.field.mapper.location } netgen.ibexa_search_extra.solr.field_mapper.descendant_indexing.content.translation.fulltext_field_resolver.native: - class: Netgen\IbexaSearchExtra\Core\Search\Solr\FieldMapper\ContentTranslation\ParentChildFieldMapper\FullTextFieldResolver\NativeFullTextFieldResolver + class: Netgen\IbexaSearchExtra\Core\Search\Solr\FieldMapper\ContentTranslation\DescendantFieldMapper\FullTextFieldResolver\NativeFullTextFieldResolver arguments: - '@Ibexa\Contracts\Core\Persistence\Content\Type\Handler' - '@Ibexa\Core\Search\Common\FieldRegistry' @@ -30,7 +30,7 @@ services: alias: netgen.ibexa_search_extra.solr.field_mapper.descendant_indexing.content.translation.fulltext_field_resolver.native netgen.ibexa_search_extra.solr.field_mapper.descendant_indexing.content.translation.fulltext: - class: Netgen\IbexaSearchExtra\Core\Search\Solr\FieldMapper\ContentTranslation\ParentChildFieldMapper\FullTextFieldMapper + class: Netgen\IbexaSearchExtra\Core\Search\Solr\FieldMapper\ContentTranslation\DescendantFieldMapper\FullTextFieldMapper arguments: - '@netgen.ibexa_search_extra.solr.field_mapper.descendant_indexing.content.translation.fulltext_field_resolver' - '@Ibexa\Contracts\Core\Persistence\Content\Type\Handler' diff --git a/tests/lib/Integration/Resources/config/event_dispatcher_override_asynchronous.yaml b/tests/lib/Integration/Resources/config/event_dispatcher_override_asynchronous.yaml index dd38745a..554bee97 100644 --- a/tests/lib/Integration/Resources/config/event_dispatcher_override_asynchronous.yaml +++ b/tests/lib/Integration/Resources/config/event_dispatcher_override_asynchronous.yaml @@ -11,7 +11,7 @@ parameters: services: netgen_search_extra.descendant_indexing.field_mapper.fulltext: - class: Netgen\IbexaSearchExtra\Core\Search\Solr\FieldMapper\ContentTranslation\ParentChildFieldMapper\FullTextFieldMapper + class: Netgen\IbexaSearchExtra\Core\Search\Solr\FieldMapper\ContentTranslation\DescendantFieldMapper\FullTextFieldMapper arguments: - '@netgen.ibexa_search_extra.solr.field_mapper.descendant_indexing.content.translation.fulltext_field_resolver.native' - '@Ibexa\Contracts\Core\Persistence\Content\Type\Handler' @@ -23,7 +23,7 @@ services: - { name: netgen.ibexa_search_extra.solr.field_mapper.descendant_indexing.content.translation } netgen.ibexa_search_extra.solr.field_mapper.descendant_indexing.content.translation: - class: Netgen\IbexaSearchExtra\Core\Search\Solr\FieldMapper\ContentTranslation\ParentChildFieldMapper + class: Netgen\IbexaSearchExtra\Core\Search\Solr\FieldMapper\ContentTranslation\DescendantFieldMapper arguments: - '%netgen.ibexa_search_extra.descendant_indexing.configuration%' - @@ -32,24 +32,24 @@ services: tags: - { name: ibexa.search.solr.field.mapper.content.translation } - Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\ParentChildIndexing\Content\CopyContentHandler: - class: Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\ParentChildIndexing\Content\CopyContentHandler + Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\DescendantIndexing\Content\CopyContentHandler: + class: Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\DescendantIndexing\Content\CopyContentHandler arguments: - '@Ibexa\Contracts\Core\Persistence\Content\Location\Handler' - '@netgen.ibexa_search_extra.descendant_indexing.ancestor_indexer' tags: - { name: messenger.message_handler } - Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\ParentChildIndexing\Content\DeleteContentHandler: - class: Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\ParentChildIndexing\Content\DeleteContentHandler + Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\DescendantIndexing\Content\DeleteContentHandler: + class: Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\DescendantIndexing\Content\DeleteContentHandler arguments: - '@Ibexa\Contracts\Core\Persistence\Content\Location\Handler' - '@netgen.ibexa_search_extra.descendant_indexing.ancestor_indexer' tags: - { name: messenger.message_handler } - Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\ParentChildIndexing\Content\DeleteTranslationHandler: - class: Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\ParentChildIndexing\Content\DeleteTranslationHandler + Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\DescendantIndexing\Content\DeleteTranslationHandler: + class: Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\DescendantIndexing\Content\DeleteTranslationHandler arguments: - '@Ibexa\Contracts\Core\Persistence\Content\Handler' - '@Ibexa\Contracts\Core\Persistence\Content\Location\Handler' @@ -57,32 +57,32 @@ services: tags: - { name: messenger.message_handler } - Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\ParentChildIndexing\Content\HideContentHandler: - class: Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\ParentChildIndexing\Content\HideContentHandler + Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\DescendantIndexing\Content\HideContentHandler: + class: Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\DescendantIndexing\Content\HideContentHandler arguments: - '@Ibexa\Contracts\Core\Persistence\Content\Location\Handler' - '@netgen.ibexa_search_extra.descendant_indexing.ancestor_indexer' tags: - { name: messenger.message_handler } - Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\ParentChildIndexing\Content\PublishVersionHandler: - class: Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\ParentChildIndexing\Content\PublishVersionHandler + Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\DescendantIndexing\Content\PublishVersionHandler: + class: Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\DescendantIndexing\Content\PublishVersionHandler arguments: - '@Ibexa\Contracts\Core\Persistence\Content\Location\Handler' - '@netgen.ibexa_search_extra.descendant_indexing.ancestor_indexer' tags: - { name: messenger.message_handler } - Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\ParentChildIndexing\Content\RevealContentHandler: - class: Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\ParentChildIndexing\Content\RevealContentHandler + Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\DescendantIndexing\Content\RevealContentHandler: + class: Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\DescendantIndexing\Content\RevealContentHandler arguments: - '@Ibexa\Contracts\Core\Persistence\Content\Location\Handler' - '@netgen.ibexa_search_extra.descendant_indexing.ancestor_indexer' tags: - { name: messenger.message_handler } - Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\ParentChildIndexing\Content\UpdateContentMetadataHandler: - class: Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\ParentChildIndexing\Content\UpdateContentMetadataHandler + Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\DescendantIndexing\Content\UpdateContentMetadataHandler: + class: Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\DescendantIndexing\Content\UpdateContentMetadataHandler arguments: - '@Ibexa\Contracts\Core\Persistence\Content\Handler' - '@Ibexa\Contracts\Core\Persistence\Content\Location\Handler' @@ -90,104 +90,104 @@ services: tags: - { name: messenger.message_handler } - Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\ParentChildIndexing\Location\AssignSectionToSubtreeHandler: - class: Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\ParentChildIndexing\Location\AssignSectionToSubtreeHandler + Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\DescendantIndexing\Location\AssignSectionToSubtreeHandler: + class: Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\DescendantIndexing\Location\AssignSectionToSubtreeHandler arguments: - '@Ibexa\Contracts\Core\Persistence\Content\Location\Handler' - '@netgen.ibexa_search_extra.descendant_indexing.ancestor_indexer' tags: - { name: messenger.message_handler } - Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\ParentChildIndexing\Location\CopySubtreeHandler: - class: Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\ParentChildIndexing\Location\CopySubtreeHandler + Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\DescendantIndexing\Location\CopySubtreeHandler: + class: Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\DescendantIndexing\Location\CopySubtreeHandler arguments: - '@Ibexa\Contracts\Core\Persistence\Content\Location\Handler' - '@netgen.ibexa_search_extra.descendant_indexing.ancestor_indexer' tags: - { name: messenger.message_handler } - Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\ParentChildIndexing\Location\CreateLocationHandler: - class: Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\ParentChildIndexing\Location\CreateLocationHandler + Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\DescendantIndexing\Location\CreateLocationHandler: + class: Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\DescendantIndexing\Location\CreateLocationHandler arguments: - '@Ibexa\Contracts\Core\Persistence\Content\Location\Handler' - '@netgen.ibexa_search_extra.descendant_indexing.ancestor_indexer' tags: - { name: messenger.message_handler } - Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\ParentChildIndexing\Location\DeleteLocationHandler: - class: Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\ParentChildIndexing\Location\DeleteLocationHandler + Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\DescendantIndexing\Location\DeleteLocationHandler: + class: Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\DescendantIndexing\Location\DeleteLocationHandler arguments: - '@Ibexa\Contracts\Core\Persistence\Content\Location\Handler' - '@netgen.ibexa_search_extra.descendant_indexing.ancestor_indexer' tags: - { name: messenger.message_handler } - Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\ParentChildIndexing\Location\HideLocationHandler: - class: Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\ParentChildIndexing\Location\HideLocationHandler + Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\DescendantIndexing\Location\HideLocationHandler: + class: Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\DescendantIndexing\Location\HideLocationHandler arguments: - '@Ibexa\Contracts\Core\Persistence\Content\Location\Handler' - '@netgen.ibexa_search_extra.descendant_indexing.ancestor_indexer' tags: - { name: messenger.message_handler } - Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\ParentChildIndexing\Location\MoveSubtreeHandler: - class: Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\ParentChildIndexing\Location\MoveSubtreeHandler + Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\DescendantIndexing\Location\MoveSubtreeHandler: + class: Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\DescendantIndexing\Location\MoveSubtreeHandler arguments: - '@Ibexa\Contracts\Core\Persistence\Content\Location\Handler' - '@netgen.ibexa_search_extra.descendant_indexing.ancestor_indexer' tags: - { name: messenger.message_handler } - Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\ParentChildIndexing\Location\SwapLocationHandler: - class: Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\ParentChildIndexing\Location\SwapLocationHandler + Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\DescendantIndexing\Location\SwapLocationHandler: + class: Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\DescendantIndexing\Location\SwapLocationHandler arguments: - '@Ibexa\Contracts\Core\Persistence\Content\Location\Handler' - '@netgen.ibexa_search_extra.descendant_indexing.ancestor_indexer' tags: - { name: messenger.message_handler } - Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\ParentChildIndexing\Location\UnhideLocationHandler: - class: Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\ParentChildIndexing\Location\UnhideLocationHandler + Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\DescendantIndexing\Location\UnhideLocationHandler: + class: Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\DescendantIndexing\Location\UnhideLocationHandler arguments: - '@Ibexa\Contracts\Core\Persistence\Content\Location\Handler' - '@netgen.ibexa_search_extra.descendant_indexing.ancestor_indexer' tags: - { name: messenger.message_handler } - Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\ParentChildIndexing\Location\UpdateLocationHandler: - class: Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\ParentChildIndexing\Location\UpdateLocationHandler + Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\DescendantIndexing\Location\UpdateLocationHandler: + class: Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\DescendantIndexing\Location\UpdateLocationHandler arguments: - '@Ibexa\Contracts\Core\Persistence\Content\Location\Handler' - '@netgen.ibexa_search_extra.descendant_indexing.ancestor_indexer' tags: - { name: messenger.message_handler } - Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\ParentChildIndexing\ObjectState\SetContentStateHandler: - class: Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\ParentChildIndexing\ObjectState\SetContentStateHandler + Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\DescendantIndexing\ObjectState\SetContentStateHandler: + class: Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\DescendantIndexing\ObjectState\SetContentStateHandler arguments: - '@Ibexa\Contracts\Core\Persistence\Content\Location\Handler' - '@netgen.ibexa_search_extra.descendant_indexing.ancestor_indexer' tags: - { name: messenger.message_handler } - Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\ParentChildIndexing\Section\AssignSectionHandler: - class: Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\ParentChildIndexing\Section\AssignSectionHandler + Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\DescendantIndexing\Section\AssignSectionHandler: + class: Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\DescendantIndexing\Section\AssignSectionHandler arguments: - '@Ibexa\Contracts\Core\Persistence\Content\Location\Handler' - '@netgen.ibexa_search_extra.descendant_indexing.ancestor_indexer' tags: - { name: messenger.message_handler } - Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\ParentChildIndexing\Trash\RecoverHandler: - class: Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\ParentChildIndexing\Trash\RecoverHandler + Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\DescendantIndexing\Trash\RecoverHandler: + class: Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\DescendantIndexing\Trash\RecoverHandler arguments: - '@Ibexa\Contracts\Core\Persistence\Content\Location\Handler' - '@netgen.ibexa_search_extra.descendant_indexing.ancestor_indexer' tags: - { name: messenger.message_handler } - Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\ParentChildIndexing\Trash\TrashHandler: - class: Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\ParentChildIndexing\Trash\TrashHandler + Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\DescendantIndexing\Trash\TrashHandler: + class: Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\DescendantIndexing\Trash\TrashHandler arguments: - '@Ibexa\Contracts\Core\Persistence\Content\Location\Handler' - '@netgen.ibexa_search_extra.descendant_indexing.ancestor_indexer' @@ -200,64 +200,64 @@ services: - 'Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\Message\Search\Content\CopyContent': - '@Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\AsynchronousIndexing\Content\CopyContentHandler' - - '@Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\ParentChildIndexing\Content\CopyContentHandler' + - '@Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\DescendantIndexing\Content\CopyContentHandler' 'Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\Message\Search\Content\DeleteContent': - '@Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\AsynchronousIndexing\Content\DeleteContentHandler' - - '@Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\ParentChildIndexing\Content\DeleteContentHandler' + - '@Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\DescendantIndexing\Content\DeleteContentHandler' 'Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\Message\Search\Content\DeleteTranslation': - '@Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\AsynchronousIndexing\Content\DeleteTranslationHandler' - - '@Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\ParentChildIndexing\Content\DeleteTranslationHandler' + - '@Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\DescendantIndexing\Content\DeleteTranslationHandler' 'Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\Message\Search\Content\HideContent': - '@Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\AsynchronousIndexing\Content\HideContentHandler' - - '@Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\ParentChildIndexing\Content\HideContentHandler' + - '@Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\DescendantIndexing\Content\HideContentHandler' 'Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\Message\Search\Content\PublishVersion': - '@Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\AsynchronousIndexing\Content\PublishVersionHandler' - - '@Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\ParentChildIndexing\Content\PublishVersionHandler' + - '@Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\DescendantIndexing\Content\PublishVersionHandler' 'Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\Message\Search\Content\RevealContent': - '@Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\AsynchronousIndexing\Content\RevealContentHandler' - - '@Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\ParentChildIndexing\Content\RevealContentHandler' + - '@Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\DescendantIndexing\Content\RevealContentHandler' 'Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\Message\Search\Content\UpdateContentMetadata': - '@Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\AsynchronousIndexing\Content\UpdateContentMetadataHandler' - - '@Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\ParentChildIndexing\Content\UpdateContentMetadataHandler' + - '@Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\DescendantIndexing\Content\UpdateContentMetadataHandler' 'Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\Message\Search\Location\AssignSectionToSubtree': - '@Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\AsynchronousIndexing\Location\AssignSectionToSubtreeHandler' - - '@Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\ParentChildIndexing\Location\AssignSectionToSubtreeHandler' + - '@Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\DescendantIndexing\Location\AssignSectionToSubtreeHandler' 'Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\Message\Search\Location\CopySubtree': - '@Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\AsynchronousIndexing\Location\CopySubtreeHandler' - - '@Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\ParentChildIndexing\Location\CopySubtreeHandler' + - '@Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\DescendantIndexing\Location\CopySubtreeHandler' 'Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\Message\Search\Location\CreateLocation': - '@Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\AsynchronousIndexing\Location\CreateLocationHandler' - - '@Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\ParentChildIndexing\Location\CreateLocationHandler' + - '@Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\DescendantIndexing\Location\CreateLocationHandler' 'Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\Message\Search\Location\DeleteLocation': - '@Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\AsynchronousIndexing\Location\DeleteLocationHandler' - - '@Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\ParentChildIndexing\Location\DeleteLocationHandler' + - '@Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\DescendantIndexing\Location\DeleteLocationHandler' 'Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\Message\Search\Location\HideLocation': - '@Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\AsynchronousIndexing\Location\HideLocationHandler' - - '@Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\ParentChildIndexing\Location\HideLocationHandler' + - '@Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\DescendantIndexing\Location\HideLocationHandler' 'Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\Message\Search\Location\MoveSubtree': - '@Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\AsynchronousIndexing\Location\MoveSubtreeHandler' - - '@Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\ParentChildIndexing\Location\MoveSubtreeHandler' + - '@Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\DescendantIndexing\Location\MoveSubtreeHandler' 'Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\Message\Search\Location\SwapLocation': - '@Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\AsynchronousIndexing\Location\SwapLocationHandler' - - '@Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\ParentChildIndexing\Location\SwapLocationHandler' + - '@Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\DescendantIndexing\Location\SwapLocationHandler' 'Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\Message\Search\Location\UnhideLocation': - '@Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\AsynchronousIndexing\Location\UnhideLocationHandler' - - '@Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\ParentChildIndexing\Location\UnhideLocationHandler' + - '@Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\DescendantIndexing\Location\UnhideLocationHandler' 'Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\Message\Search\Location\UpdateLocation': - '@Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\AsynchronousIndexing\Location\UpdateLocationHandler' - - '@Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\ParentChildIndexing\Location\UpdateLocationHandler' + - '@Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\DescendantIndexing\Location\UpdateLocationHandler' 'Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\Message\Search\ObjectState\SetContentState': - '@Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\AsynchronousIndexing\ObjectState\SetContentStateHandler' - - '@Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\ParentChildIndexing\ObjectState\SetContentStateHandler' + - '@Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\DescendantIndexing\ObjectState\SetContentStateHandler' 'Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\Message\Search\Section\AssignSection': - '@Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\AsynchronousIndexing\Section\AssignSectionHandler' - - '@Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\ParentChildIndexing\Section\AssignSectionHandler' + - '@Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\DescendantIndexing\Section\AssignSectionHandler' 'Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\Message\Search\Trash\Recover': - '@Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\AsynchronousIndexing\Trash\RecoverHandler' - - '@Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\ParentChildIndexing\Trash\RecoverHandler' + - '@Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\DescendantIndexing\Trash\RecoverHandler' 'Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\Message\Search\Trash\Trash': - '@Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\AsynchronousIndexing\Trash\TrashHandler' - - '@Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\ParentChildIndexing\Trash\TrashHandler' + - '@Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\DescendantIndexing\Trash\TrashHandler' 'Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\Message\Search\User\AssignUserToUserGroup': - '@Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\AsynchronousIndexing\User\AssignUserToUserGroupHandler' 'Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\Message\Search\User\BeforeUnAssignUserFromUserGroup': diff --git a/tests/lib/Unit/Core/HierarchicalIndexing/AncestorPathGeneratorTest.php b/tests/lib/Unit/Core/HierarchicalIndexing/AncestorPathGeneratorTest.php index ea002f74..bd662474 100644 --- a/tests/lib/Unit/Core/HierarchicalIndexing/AncestorPathGeneratorTest.php +++ b/tests/lib/Unit/Core/HierarchicalIndexing/AncestorPathGeneratorTest.php @@ -4,7 +4,7 @@ namespace Netgen\IbexaSearchExtra\Tests\Unit\Core\HierarchicalIndexing; -use Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\ParentChildIndexing\AncestorPathGenerator; +use Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\DescendantIndexing\AncestorPathGenerator; use PHPUnit\Framework\TestCase; /** diff --git a/tests/lib/Unit/Core/HierarchicalIndexing/AncestorResolverTest.php b/tests/lib/Unit/Core/HierarchicalIndexing/AncestorResolverTest.php index 8fc67ed2..a51b37d5 100644 --- a/tests/lib/Unit/Core/HierarchicalIndexing/AncestorResolverTest.php +++ b/tests/lib/Unit/Core/HierarchicalIndexing/AncestorResolverTest.php @@ -11,8 +11,8 @@ use Ibexa\Contracts\Core\Persistence\Content\Type; use Ibexa\Contracts\Core\Persistence\Content\Type\Handler as ContentTypeHandlerInterface; use Ibexa\Core\Base\Exceptions\NotFoundException; -use Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\ParentChildIndexing\AncestorPathGenerator; -use Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\ParentChildIndexing\AncestorResolver; +use Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\DescendantIndexing\AncestorPathGenerator; +use Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\DescendantIndexing\AncestorResolver; use PHPUnit\Framework\MockObject\MockObject; use PHPUnit\Framework\TestCase; use RuntimeException;