Merge pull request #51 from pierredup/patch-2

Support jms/serializer-bundle 2.x

Author: dbu

composer.json

@@ -12,7 +12,7 @@
     "require": {
         "php": "^5.6|^7.0",
         "symfony-cmf/resource-bundle": "1.0.*",
-        "jms/serializer-bundle": "^1.0"
+        "jms/serializer-bundle": "^1.0 | ^2.0"
     },
     "require-dev": {
         "symfony-cmf/testing": "^2.0",

src/Resources/config/resource-rest.xml

@@ -7,7 +7,7 @@
     <services>
 
         <service id="cmf_resource_rest.controller.resource" class="Symfony\Cmf\Bundle\ResourceRestBundle\Controller\ResourceController">
-            <argument type="service" id="serializer" />
+            <argument type="service" id="jms_serializer" />
             <argument type="service" id="cmf_resource.registry" />
             <argument type="service" id="cmf_resource_rest.serializer.jms.handler.resource" />
             <argument type="service" id="security.authorization_checker" on-invalid="ignore" />