[JMS] allow v5

coreshop · Dec 21, 2023 · c015868 · c015868
1 parent 974ea34
commit c015868
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 7 deletions.
diff --git a/composer.json b/composer.json
@@ -93,7 +93,7 @@
     "doctrine/orm": "^2.9",
     "fakerphp/faker": "^1.16",
     "gedmo/doctrine-extensions": "^3.11",
-    "jms/serializer-bundle": "^4.0",
+    "jms/serializer-bundle": "^4.0 | ^5.0",
     "knplabs/knp-menu-bundle": "^3.1",
     "laminas/laminas-stdlib": "^3.6",
     "laminas/laminas-zendframework-bridge": "^1.5",

diff --git a/src/CoreShop/Bundle/ResourceBundle/Resources/config/services.yml b/src/CoreShop/Bundle/ResourceBundle/Resources/config/services.yml
@@ -77,7 +77,7 @@ services:
             - '@translator'
 
     CoreShop\Bundle\ResourceBundle\Serialization\Driver\PimcoreDataObjectDriver:
-        decorates: 'jms_serializer.metadata.annotation_driver'
+        decorates: 'jms_serializer.metadata_driver'
         arguments:
             - '@CoreShop\Bundle\ResourceBundle\Serialization\Driver\PimcoreDataObjectDriver.inner'
 
@@ -89,7 +89,6 @@ services:
         decorates: 'jms_serializer.object_constructor'
         arguments:
             - '@CoreShop\Bundle\ResourceBundle\Serialization\VersionObjectConstructor.inner'
-            - '@jms_serializer.unserialize_object_constructor'
 
     CoreShop\Component\Resource\Service\FolderCreationServiceInterface: '@CoreShop\Component\Resource\Service\FolderCreationService'
     CoreShop\Component\Resource\Service\FolderCreationService:

diff --git a/src/CoreShop/Bundle/ResourceBundle/Serialization/VersionObjectConstructor.php b/src/CoreShop/Bundle/ResourceBundle/Serialization/VersionObjectConstructor.php
@@ -31,7 +31,6 @@ class VersionObjectConstructor implements ObjectConstructorInterface
 {
     public function __construct(
         private ObjectConstructorInterface $fallbackConstructor,
-        private ObjectConstructorInterface $fallbacksFallbackConstructor,
         private string $fallbackStrategy = DoctrineObjectConstructor::ON_MISSING_FALLBACK,
         private ?\JMS\Serializer\Exclusion\ExpressionLanguageExclusionStrategy $expressionLanguageExclusionStrategy = null,
     ) {
@@ -98,7 +97,7 @@ public function construct(DeserializationVisitorInterface $visitor, ClassMetadat
         }
 
         if (array_key_exists('id', $identifierList) && !$identifierList['id']) {
-            return $this->fallbacksFallbackConstructor->construct($visitor, $metadata, $data, $type, $context);
+            return $this->fallbackConstructor->construct($visitor, $metadata, $data, $type, $context);
         }
 
         // Entity update, load it from database
@@ -111,7 +110,7 @@ public function construct(DeserializationVisitorInterface $visitor, ClassMetadat
                 case DoctrineObjectConstructor::ON_MISSING_EXCEPTION:
                     throw new ObjectConstructionException(sprintf('Entity %s can not be found', $metadata->name));
                 case DoctrineObjectConstructor::ON_MISSING_FALLBACK:
-                    return $this->fallbacksFallbackConstructor->construct($visitor, $metadata, $data, $type, $context);
+                    return $this->fallbackConstructor->construct($visitor, $metadata, $data, $type, $context);
                 default:
                     throw new InvalidArgumentException('The provided fallback strategy for the object constructor is not valid');
             }

diff --git a/src/CoreShop/Bundle/ResourceBundle/composer.json b/src/CoreShop/Bundle/ResourceBundle/composer.json
@@ -26,7 +26,7 @@
   "require": {
     "doctrine/orm": "^2.9",
     "doctrine/doctrine-bundle": "^2.4",
-    "jms/serializer-bundle": "^4.0",
+    "jms/serializer-bundle": "^4.0 | ^5.0",
     "stof/doctrine-extensions-bundle": "^1.6",
     "coreshop/pimcore-bundle": "^4.0",
     "coreshop/locale-bundle": "^4.0",