Merge branch '1.x' into 2.x

# Conflicts: # composer.json
pimcore · Dec 9, 2024 · ff8929b · ff8929b
2 parents ae23844 + 48dfc20
commit ff8929b
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 2 deletions.
diff --git a/config/pimcore/messenger.yaml b/config/pimcore/messenger.yaml
@@ -1,9 +1,10 @@
 framework:
     messenger:
         enabled: true
-        failure_transport: pimcore_generic_data_index_failed
         transports:
-            pimcore_generic_data_index_queue: 'doctrine://default?queue_name=pimcore_generic_data_index_queue'
+            pimcore_generic_data_index_queue:
+                dsn: 'doctrine://default?queue_name=pimcore_generic_data_index_queue'
+                failure_transport: pimcore_generic_data_index_failed
             pimcore_generic_data_index_sync: 'sync://'
             pimcore_generic_data_index_failed: 'doctrine://default?queue_name=pimcore_generic_data_index_failed'
         routing:

diff --git a/src/autoload.php b/src/autoload.php
@@ -68,10 +68,17 @@
 use Pimcore\Bundle\GenericDataIndexBundle\Model\OpenSearch\Traits\QueryObjectsToArrayTrait as OpenSearchQueryObjectsToArrayTrait;
 use Pimcore\Bundle\GenericDataIndexBundle\Model\OpenSearch\Traits\SimplifySingleTypesTrait as OpenSearchSimplifySingleTypesTrait;
 use Pimcore\Bundle\GenericDataIndexBundle\SearchIndexAdapter\DefaultSearch\Asset\FieldDefinitionAdapter\AbstractAdapter as AssetAbstractAdapter;
+use Pimcore\Bundle\GenericDataIndexBundle\SearchIndexAdapter\DefaultSearch\Asset\FieldDefinitionAdapter\BooleanAdapter;
+use Pimcore\Bundle\GenericDataIndexBundle\SearchIndexAdapter\DefaultSearch\Asset\FieldDefinitionAdapter\DateAdapter;
+use Pimcore\Bundle\GenericDataIndexBundle\SearchIndexAdapter\DefaultSearch\Asset\FieldDefinitionAdapter\KeywordAdapter;
+use Pimcore\Bundle\GenericDataIndexBundle\SearchIndexAdapter\DefaultSearch\Asset\FieldDefinitionAdapter\RelationAdapter;
+use Pimcore\Bundle\GenericDataIndexBundle\SearchIndexAdapter\DefaultSearch\Asset\FieldDefinitionAdapter\TextKeywordAdapter;
 use Pimcore\Bundle\GenericDataIndexBundle\SearchIndexAdapter\DefaultSearch\DataObject\FieldDefinitionAdapter\AbstractAdapter as DataObjectAbstractAdapter;
 use Pimcore\Bundle\GenericDataIndexBundle\SearchIndexAdapter\OpenSearch\Asset\FieldDefinitionAdapter\AbstractAdapter as OpenSearchAssetAbstractAdapter;
 use Pimcore\Bundle\GenericDataIndexBundle\SearchIndexAdapter\OpenSearch\DataObject\FieldDefinitionAdapter\AbstractAdapter as OpenSearchDataObjectAbstractAdapter;
 
+const ASSET_FIELD_DEFINITION_ADAPTER_NAMESPACE = 'Pimcore\\Bundle\GenericDataIndexBundle\\SearchIndexAdapter\\OpenSearch\\Asset\\FieldDefinitionAdapter\\';
+
 $classesToAlias = [
     AttributeType::class => OpenSearchAttributeType::class,
     ConditionType::class => OpenSearchConditionType::class,
@@ -101,6 +108,11 @@
     DefaultSearchInterface::class => OpenSearchSearchInterface::class,
     AssetAbstractAdapter::class => OpenSearchAssetAbstractAdapter::class,
     DataObjectAbstractAdapter::class => OpenSearchDataObjectAbstractAdapter::class,
+    BooleanAdapter::class => ASSET_FIELD_DEFINITION_ADAPTER_NAMESPACE . 'BooleanAdapter',
+    DateAdapter::class => ASSET_FIELD_DEFINITION_ADAPTER_NAMESPACE . 'DateAdapter',
+    KeywordAdapter::class => ASSET_FIELD_DEFINITION_ADAPTER_NAMESPACE . 'KeywordAdapter',
+    RelationAdapter::class => ASSET_FIELD_DEFINITION_ADAPTER_NAMESPACE . 'RelationAdapter',
+    TextKeywordAdapter::class => ASSET_FIELD_DEFINITION_ADAPTER_NAMESPACE . 'TextKeywordAdapter',
 ];
 
 foreach ($classesToAlias as $originalClass => $aliasClass) {