From 20fc7b74e5b21013b1240197dde37dc8b18b72ac Mon Sep 17 00:00:00 2001 From: lukmzig Date: Tue, 17 Dec 2024 08:27:46 +0100 Subject: [PATCH] add other changes related to bc breaks --- .../DefaultSearch/Debug/SearchInformation.php | 5 ++--- src/PimcoreGenericDataIndexBundle.php | 17 +---------------- 2 files changed, 3 insertions(+), 19 deletions(-) diff --git a/src/Model/DefaultSearch/Debug/SearchInformation.php b/src/Model/DefaultSearch/Debug/SearchInformation.php index 6e5c5c09..1ec2636c 100644 --- a/src/Model/DefaultSearch/Debug/SearchInformation.php +++ b/src/Model/DefaultSearch/Debug/SearchInformation.php @@ -23,10 +23,9 @@ */ final class SearchInformation { - // ToDo make constants public in 2.0 - public const VERBOSITY_VERBOSE = 2; + private const VERBOSITY_VERBOSE = 2; - public const VERBOSITY_VERY_VERBOSE = 3; + private const VERBOSITY_VERY_VERBOSE = 3; public function __construct( private readonly AdapterSearchInterface $search, diff --git a/src/PimcoreGenericDataIndexBundle.php b/src/PimcoreGenericDataIndexBundle.php index 956fd5c4..10d0cd1c 100644 --- a/src/PimcoreGenericDataIndexBundle.php +++ b/src/PimcoreGenericDataIndexBundle.php @@ -17,8 +17,7 @@ namespace Pimcore\Bundle\GenericDataIndexBundle; use Pimcore\Bundle\ElasticsearchClientBundle\PimcoreElasticsearchClientBundle; -use Pimcore\Bundle\GenericDataIndexBundle\Attribute\OpenSearch\AsSearchModifierHandler; -use Pimcore\Bundle\GenericDataIndexBundle\Attribute\Search\AsSearchModifierHandler as SearchModifierHandler; +use Pimcore\Bundle\GenericDataIndexBundle\Attribute\Search\AsSearchModifierHandler; use Pimcore\Bundle\GenericDataIndexBundle\DependencyInjection\Compiler\SearchModifierHandlerPass; use Pimcore\Bundle\GenericDataIndexBundle\DependencyInjection\Compiler\ServiceLocatorPass; use Pimcore\Bundle\GenericDataIndexBundle\Enum\DependencyInjection\ServiceTag; @@ -70,20 +69,6 @@ public static function registerDependentBundles(BundleCollection $collection): v private function registerSearchModifierAttribute(ContainerBuilder $container): void { - $container->registerAttributeForAutoconfiguration( - SearchModifierHandler::class, - static function ( - ChildDefinition $definition, - SearchModifierHandler $attribute, - Reflector $reflector - ): void { - self::configureSearchModifierHandler($definition, $reflector); - } - ); - - /** - * @TODO Remove this in version 2.0 - */ $container->registerAttributeForAutoconfiguration( AsSearchModifierHandler::class, static function (