Skip to content

Commit 0cdfc08

Browse files
committed
fix: merge conflict
1 parent 511e331 commit 0cdfc08

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

src/SearchIndexAdapter/DefaultSearch/Asset/FieldDefinitionAdapter/AbstractAdapter.php

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,10 @@
1818

1919
use Pimcore\Bundle\GenericDataIndexBundle\Enum\SearchIndex\FieldCategory;
2020
use Pimcore\Bundle\GenericDataIndexBundle\Exception\InvalidArgumentException;
21-
use Pimcore\Bundle\GenericDataIndexBundle\Model\OpenSearch\Aggregation\Aggregation;
22-
use Pimcore\Bundle\GenericDataIndexBundle\Model\OpenSearch\OpenSearchSearchInterface;
23-
use Pimcore\Bundle\GenericDataIndexBundle\Model\OpenSearch\Query\TermFilter;
24-
use Pimcore\Bundle\GenericDataIndexBundle\Model\OpenSearch\Query\TermsFilter;
21+
use Pimcore\Bundle\GenericDataIndexBundle\Model\DefaultSearch\Aggregation\Aggregation;
22+
use Pimcore\Bundle\GenericDataIndexBundle\Model\DefaultSearch\DefaultSearchInterface;
23+
use Pimcore\Bundle\GenericDataIndexBundle\Model\DefaultSearch\Query\TermFilter;
24+
use Pimcore\Bundle\GenericDataIndexBundle\Model\DefaultSearch\Query\TermsFilter;
2525
use Pimcore\Bundle\GenericDataIndexBundle\Model\Search\Interfaces\AdapterSearchInterface;
2626
use Pimcore\Bundle\GenericDataIndexBundle\Model\Search\Modifier\Aggregation\Asset\AssetMetaDataAggregation;
2727
use Pimcore\Bundle\GenericDataIndexBundle\Model\Search\Modifier\Filter\Asset\AssetMetaDataFilter;
@@ -60,7 +60,7 @@ public function normalize(mixed $value): mixed
6060
}
6161

6262
/**
63-
* @param OpenSearchSearchInterface $adapterSearch
63+
* @param DefaultSearchInterface $adapterSearch
6464
*
6565
* @throws InvalidArgumentException
6666
*/

0 commit comments

Comments
 (0)