add other changes related to bc breaks

pimcore · Dec 17, 2024 · 20fc7b7 · 20fc7b7
1 parent 1d9a517
commit 20fc7b7
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 19 deletions.
diff --git 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
@@ -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 (