fix: merge conflict

pimcore · Nov 25, 2024 · 0cdfc08 · 0cdfc08
1 parent 511e331
commit 0cdfc08
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/src/SearchIndexAdapter/DefaultSearch/Asset/FieldDefinitionAdapter/AbstractAdapter.php b/src/SearchIndexAdapter/DefaultSearch/Asset/FieldDefinitionAdapter/AbstractAdapter.php
@@ -18,10 +18,10 @@
 
 use Pimcore\Bundle\GenericDataIndexBundle\Enum\SearchIndex\FieldCategory;
 use Pimcore\Bundle\GenericDataIndexBundle\Exception\InvalidArgumentException;
-use Pimcore\Bundle\GenericDataIndexBundle\Model\OpenSearch\Aggregation\Aggregation;
-use Pimcore\Bundle\GenericDataIndexBundle\Model\OpenSearch\OpenSearchSearchInterface;
-use Pimcore\Bundle\GenericDataIndexBundle\Model\OpenSearch\Query\TermFilter;
-use Pimcore\Bundle\GenericDataIndexBundle\Model\OpenSearch\Query\TermsFilter;
+use Pimcore\Bundle\GenericDataIndexBundle\Model\DefaultSearch\Aggregation\Aggregation;
+use Pimcore\Bundle\GenericDataIndexBundle\Model\DefaultSearch\DefaultSearchInterface;
+use Pimcore\Bundle\GenericDataIndexBundle\Model\DefaultSearch\Query\TermFilter;
+use Pimcore\Bundle\GenericDataIndexBundle\Model\DefaultSearch\Query\TermsFilter;
 use Pimcore\Bundle\GenericDataIndexBundle\Model\Search\Interfaces\AdapterSearchInterface;
 use Pimcore\Bundle\GenericDataIndexBundle\Model\Search\Modifier\Aggregation\Asset\AssetMetaDataAggregation;
 use Pimcore\Bundle\GenericDataIndexBundle\Model\Search\Modifier\Filter\Asset\AssetMetaDataFilter;
@@ -60,7 +60,7 @@ public function normalize(mixed $value): mixed
     }
 
     /**
-     * @param OpenSearchSearchInterface $adapterSearch
+     * @param DefaultSearchInterface $adapterSearch
      *
      * @throws InvalidArgumentException
      */