Remove a hack

GuilhemN · GuilhemN · commit 7bcd70b2173e · 2016-04-24T14:32:43.000+02:00
diff --git a/Serializer/Normalizer/FormErrorNormalizer.php b/Serializer/Normalizer/FormErrorNormalizer.php
@@ -11,7 +11,6 @@
 
 namespace FOS\RestBundle\Serializer\Normalizer;
 
-use FOS\RestBundle\Util\FormWrapper;
 use Symfony\Component\Form\FormError;
 use Symfony\Component\Form\FormInterface;
 use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
@@ -36,10 +35,6 @@ public function __construct(TranslatorInterface $translator)
      */
     public function normalize($object, $format = null, array $context = [])
     {
-        if ($object instanceof FormWrapper) {
-            $object = $object->form;
-        }
-
         return [
             'code' => isset($context['status_code']) ? $context['status_code'] : null,
             'message' => 'Validation Failed',
@@ -52,10 +47,6 @@ public function normalize($object, $format = null, array $context = [])
      */
     public function supportsNormalization($data, $format = null)
     {
-        if ($data instanceof FormWrapper) {
-            $data = $data->form;
-        }
-
         return $data instanceof FormInterface && $data->isSubmitted() && !$data->isValid();
     }
 
diff --git a/Serializer/SymfonySerializerAdapter.php b/Serializer/SymfonySerializerAdapter.php
@@ -12,8 +12,6 @@
 namespace FOS\RestBundle\Serializer;
 
 use FOS\RestBundle\Context\Context;
-use FOS\RestBundle\Util\FormWrapper;
-use Symfony\Component\Form\FormInterface;
 use Symfony\Component\Serializer\SerializerInterface;
 
 /**
@@ -35,14 +33,6 @@ public function __construct(SerializerInterface $serializer)
      */
     public function serialize($data, $format, Context $context)
     {
-        /*
-         * Bug fix, see https://github.com/symfony/symfony/pull/17984
-         * will be removed in the future.
-         */
-        if ($data instanceof FormInterface && $format === 'xml') {
-            $data = new FormWrapper($data);
-        }
-
         $newContext = $this->convertContext($context);
         $newContext['serializeNull'] = $context->getSerializeNull();
 
diff --git a/Util/FormWrapper.php b/Util/FormWrapper.php
diff --git a/composer.json b/composer.json
@@ -36,7 +36,7 @@
         "symfony/phpunit-bridge":         "~2.7|^3.0",
         "symfony/form":                   "^2.7|^3.0",
         "symfony/validator":              "^2.7|^3.0",
-        "symfony/serializer":             "^2.7|^3.0",
+        "symfony/serializer":             "^2.7.11|^3.0.4",
         "symfony/yaml":                   "^2.7|^3.0",
         "symfony/security-bundle":        "^2.7|^3.0",
         "symfony/web-profiler-bundle":    "^2.7|^3.0",
