From cc09b6061175fc35d3bb6d3f67c9a86dd0134d87 Mon Sep 17 00:00:00 2001
From: Morgan Nilsson <54358647+morgannilsson@users.noreply.github.com>
Date: Mon, 2 Dec 2024 09:35:17 +0100
Subject: [PATCH 1/3] Do not overwrite default failure transport (#261)

* Do not overwrite default failure transport

* I have read the CLA Document and I hereby sign the CLA
---
 config/pimcore/messenger.yaml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/config/pimcore/messenger.yaml b/config/pimcore/messenger.yaml
index b0b59660..a0f3dbae 100644
--- 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:

From fe254ba7b767fb61acc74aafe7f24d90ce78f302 Mon Sep 17 00:00:00 2001
From: Matthias Schuhmayer <38959016+mattamon@users.noreply.github.com>
Date: Mon, 2 Dec 2024 11:42:50 +0100
Subject: [PATCH 2/3] Update pimcore/pimcore to ^11.5

Update pimcore/opensearch-client and pimcore/elasticsearch-client to ^1.1
---
 composer.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/composer.json b/composer.json
index bb162c81..8de837ea 100644
--- a/composer.json
+++ b/composer.json
@@ -18,10 +18,10 @@
   "minimum-stability": "dev",
   "require": {
     "php": "~8.2.0 || ~8.3.0 ",
-    "pimcore/pimcore": "^11.x-dev",
+    "pimcore/pimcore": "^11.5",
     "pimcore/static-resolver-bundle": "^1.4.0 || ^2.0",
-    "pimcore/opensearch-client": "^1.x-dev",
-    "pimcore/elasticsearch-client": "^1.x-dev",
+    "pimcore/opensearch-client": "^1.1",
+    "pimcore/elasticsearch-client": "^1.1",
     "doctrine/orm": "^2.17.2",
     "symfony/scheduler": "^6.4",
     "symfony/messenger": "^6.4"

From 48dfc20ed17be44eab7c7ce3244ca99fb2d723e4 Mon Sep 17 00:00:00 2001
From: markus-moser <markus.moser@pimcore.com>
Date: Thu, 5 Dec 2024 09:31:13 +0100
Subject: [PATCH 3/3] Add class_alias for asset field definition adapters
 (#267)

---
 src/autoload.php | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/src/autoload.php b/src/autoload.php
index 622e3cf6..8fef290e 100644
--- 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) {