Fix data object normalizer and improve field definition adapter for W…

…YSIWYG (#22)
pimcore · Feb 2, 2024 · 383b976 · 383b976
1 parent ecddacc
commit 383b976
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 40 deletions.
diff --git a/config/services/search/data-object/field-definition-adapters.yml b/config/services/search/data-object/field-definition-adapters.yml
@@ -4,15 +4,11 @@ services:
         autoconfigure: true
         public: false
 
-    Pimcore\Bundle\GenericDataIndexBundle\Service\SearchIndex\DataObject\FieldDefinitionAdapter\TextAdapter:
+    Pimcore\Bundle\GenericDataIndexBundle\Service\SearchIndex\DataObject\FieldDefinitionAdapter\TextKeywordAdapter:
         shared: false
         tags:
             - { name: "pimcore.generic_data_index.data-object.search_index_field_definition", type: "wysiwyg" }
             - { name: "pimcore.generic_data_index.data-object.search_index_field_definition", type: "textarea" }
-
-    Pimcore\Bundle\GenericDataIndexBundle\Service\SearchIndex\DataObject\FieldDefinitionAdapter\TextKeywordAdapter:
-        shared: false
-        tags:
             - { name: "pimcore.generic_data_index.data-object.search_index_field_definition", type: "select" }
             - { name: "pimcore.generic_data_index.data-object.search_index_field_definition", type: "multiselect" }
             - { name: "pimcore.generic_data_index.data-object.search_index_field_definition", type: "input" }

diff --git a/src/Service/Normalizer/DataObjectNormalizer.php b/src/Service/Normalizer/DataObjectNormalizer.php
@@ -22,7 +22,6 @@
 use Pimcore\Model\DataObject\Concrete;
 use Pimcore\Model\DataObject\Folder;
 use Pimcore\Model\DataObject\Localizedfield;
-use Symfony\Component\Serializer\Exception\ExceptionInterface;
 use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
 
 /**
@@ -118,7 +117,7 @@ private function normalizeStandardFields(Concrete $dataObject): array
             foreach ($dataObject->getClass()->getFieldDefinitions() as $key => $fieldDefinition) {
 
                 $value = $dataObject->get($key);
-                if($fieldDefinition instanceof NormalizerInterface) {
+                if($fieldDefinition instanceof \Pimcore\Normalizer\NormalizerInterface) {
                     $value = $fieldDefinition->normalize($value);
                 }
 
@@ -129,7 +128,7 @@ private function normalizeStandardFields(Concrete $dataObject): array
             Localizedfield::setGetFallbackValues($fallbackLanguagesBackup);
 
             return $result;
-        } catch (Exception|ExceptionInterface $e) {
+        } catch (Exception $e) {
             throw new DataObjectNormalizerException($e->getMessage());
         }
     }

diff --git a/src/Service/SearchIndex/DataObject/FieldDefinitionAdapter/TextAdapter.php b/src/Service/SearchIndex/DataObject/FieldDefinitionAdapter/TextAdapter.php