Merge pull request #1879 from xabbuh/issue-1806

prefer decoration over parameter replacements

Author: GuilhemN

DependencyInjection/Compiler/JMSFormErrorHandlerPass.php

@@ -14,18 +14,26 @@
 use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use FOS\RestBundle\Serializer\Normalizer\FormErrorHandler;
+use Symfony\Component\DependencyInjection\Reference;
 
 /**
- * Changes the JMS FormError handler.
+ * Decorates the JMS FormErrorHandler.
  *
  * @author Guilhem Niot <[email protected]>
+ * @author Christian Flothmann <[email protected]>
  *
  * @internal
  */
 final class JMSFormErrorHandlerPass implements CompilerPassInterface
 {
     public function process(ContainerBuilder $container)
     {
-        $container->setParameter('jms_serializer.form_error_handler.class', FormErrorHandler::class);
+        if (!$container->has('jms_serializer.form_error_handler')) {
+            return;
+        }
+
+        $container->register('fos_rest.serializer.form_error_handler', FormErrorHandler::class)
+            ->setDecoratedService('jms_serializer.form_error_handler')
+            ->addArgument(new Reference('fos_rest.serializer.form_error_handler.inner'));
     }
 }

Serializer/Normalizer/FormErrorHandler.php

@@ -13,23 +13,27 @@
 
 use JMS\Serializer\Context;
 use JMS\Serializer\Handler\FormErrorHandler as JMSFormErrorHandler;
+use JMS\Serializer\Handler\SubscribingHandlerInterface;
 use JMS\Serializer\JsonSerializationVisitor;
 use JMS\Serializer\XmlSerializationVisitor;
 use Symfony\Component\Form\Form;
 use JMS\Serializer\YamlSerializationVisitor;
-use Symfony\Component\Translation\TranslatorInterface;
 
 /**
  * Extend the JMS FormErrorHandler to include more informations when using the ViewHandler.
  */
-class FormErrorHandler extends JMSFormErrorHandler
+class FormErrorHandler implements SubscribingHandlerInterface
 {
-    private $translator;
+    private $formErrorHandler;
 
-    public function __construct(TranslatorInterface $translator)
+    public function __construct(JMSFormErrorHandler $formErrorHandler)
     {
-        $this->translator = $translator;
-        parent::__construct($translator);
+        $this->formErrorHandler = $formErrorHandler;
+    }
+
+    public static function getSubscribingMethods()
+    {
+        return JMSFormErrorHandler::getSubscribingMethods();
     }
 
     public function serializeFormToXml(XmlSerializationVisitor $visitor, Form $form, array $type, Context $context = null)
@@ -52,20 +56,20 @@ public function serializeFormToXml(XmlSerializationVisitor $visitor, Form $form,
                 $errorsNode = $visitor->document->createElement('errors');
                 $visitor->getCurrentNode()->appendChild($errorsNode);
                 $visitor->setCurrentNode($errorsNode);
-                parent::serializeFormToXml($visitor, $form, $type);
+                $this->formErrorHandler->serializeFormToXml($visitor, $form, $type);
                 $visitor->revertCurrentNode();
 
                 return;
             }
         }
 
-        return parent::serializeFormToXml($visitor, $form, $type);
+        return $this->formErrorHandler->serializeFormToXml($visitor, $form, $type);
     }
 
     public function serializeFormToJson(JsonSerializationVisitor $visitor, Form $form, array $type, Context $context = null)
     {
         $isRoot = null === $visitor->getRoot();
-        $result = $this->adaptFormArray(parent::serializeFormToJson($visitor, $form, $type), $context);
+        $result = $this->adaptFormArray($this->formErrorHandler->serializeFormToJson($visitor, $form, $type), $context);
 
         if ($isRoot) {
             $visitor->setRoot($result);
@@ -77,7 +81,7 @@ public function serializeFormToJson(JsonSerializationVisitor $visitor, Form $for
     public function serializeFormToYml(YamlSerializationVisitor $visitor, Form $form, array $type, Context $context = null)
     {
         $isRoot = null === $visitor->getRoot();
-        $result = $this->adaptFormArray(parent::serializeFormToYml($visitor, $form, $type), $context);
+        $result = $this->adaptFormArray($this->formErrorHandler->serializeFormToYml($visitor, $form, $type), $context);
 
         if ($isRoot) {
             $visitor->setRoot($result);
@@ -86,6 +90,11 @@ public function serializeFormToYml(YamlSerializationVisitor $visitor, Form $form
         return $result;
     }
 
+    public function __call($name, $arguments)
+    {
+        return call_user_func_array([$this->formErrorHandler, $name], $arguments);
+    }
+
     private function adaptFormArray(\ArrayObject $serializedForm, Context $context = null)
     {
         $statusCode = $this->getStatusCode($context);

Tests/Functional/DependencyInjectionTest.php

@@ -29,7 +29,7 @@ public function testSerializerRelatedServicesAreNotRemovedWhenJmsSerializerBundl
         self::bootKernel();
         $container = self::$kernel->getContainer();
 
-        $this->assertSame(FormErrorHandler::class, $container->getParameter('jms_serializer.form_error_handler.class'));
+        $this->assertInstanceOf(FormErrorHandler::class, $container->get('jms_serializer.form_error_handler'));
         $this->assertInstanceOf(JMSHandlerRegistry::class, $container->get('test.jms_serializer.handler_registry'));
     }