drop Serializer in favor of SerializerBundle

daFish · May 28, 2011 · 3991dde · 3991dde
1 parent c860137
commit 3991dde
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 278 deletions.
diff --git a/DependencyInjection/Configuration.php b/DependencyInjection/Configuration.php
@@ -41,7 +41,6 @@ public function getConfigTreeBuilder()
         $rootNode
             ->fixXmlConfig('format', 'formats')
             ->fixXmlConfig('normalizer', 'normalizers')
-            ->fixXmlConfig('default_normalizer', 'default_normalizers')
             ->fixXmlConfig('class', 'classes')
             ->fixXmlConfig('service', 'services')
             ->children()
@@ -50,12 +49,7 @@ public function getConfigTreeBuilder()
                     ->useAttributeAsKey('name')
                     ->prototype('scalar')->end()
                 ->end()
-                ->arrayNode('default_normalizers')
-                    ->prototype('scalar')->end()
-                ->end()
-                ->scalarNode('fallback_normalizer')->defaultNull()->end()
                 ->arrayNode('normalizers')
-                    ->useAttributeAsKey('name')
                     ->prototype('scalar')->end()
                 ->end()
                 ->arrayNode('exception')
@@ -98,7 +92,7 @@ public function getConfigTreeBuilder()
                     ->addDefaultsIfNotSet()
                     ->children()
                         ->scalarNode('view')->defaultValue('FOS\RestBundle\View\View')->end()
-                        ->scalarNode('serializer')->defaultValue('FOS\RestBundle\Serializer\Serializer')->end()
+                        ->scalarNode('serializer')->defaultValue('Symfony\Component\Serializer\Serializer')->end()
                         ->scalarNode('json')->defaultValue('Symfony\Component\Serializer\Encoder\JsonEncoder')->end()
                         ->scalarNode('xml')->defaultValue('Symfony\Component\Serializer\Encoder\XmlEncoder')->end()
                         ->scalarNode('html')->defaultValue('FOS\RestBundle\Serializer\Encoder\HtmlEncoder')->end()

diff --git a/DependencyInjection/FOSRestExtension.php b/DependencyInjection/FOSRestExtension.php
@@ -3,13 +3,12 @@
 namespace FOS\RestBundle\DependencyInjection;
 
 use Symfony\Component\Config\Definition\Processor,
+    Symfony\Component\Config\FileLocator,
     Symfony\Component\HttpKernel\DependencyInjection\Extension,
     Symfony\Component\DependencyInjection\Reference,
     Symfony\Component\DependencyInjection\ContainerInterface,
-    Symfony\Component\DependencyInjection\Loader\XmlFileLoader,
     Symfony\Component\DependencyInjection\ContainerBuilder,
-    Symfony\Component\Config\FileLocator,
-    Symfony\Component\DependencyInjection\DefinitionDecorator;
+    Symfony\Component\DependencyInjection\Loader\XmlFileLoader;
 
 /*
  * This file is part of the FOSRestBundle
@@ -39,10 +38,6 @@ public function load(array $configs, ContainerBuilder $container)
                 'xml'   => 'fos_rest.xml',
                 'html'  => 'fos_rest.html',
             ),
-            'default_normalizers' => array(
-                'fos_rest.constraint_violation_normalizer',
-                'fos_rest.constraint_violation_list_normalizer',
-            ),
         ));
 
         $processor = new Processor();
@@ -66,39 +61,23 @@ public function load(array $configs, ContainerBuilder $container)
                 $encoder->addTag('jms_serializer.encoder', array('format' => $format));
             }
 
-            foreach ($config['default_normalizers'] as $normalizer) {
-                if ($normalizer) {
-                    $normalizer = $container->getDefinition($normalizer);
-                    $normalizer->addTag('jms_serializer.normalizer');
-                }
-            }
-
-            if ($config['fallback_normalizer']) {
-                $container->setAlias('jms_serializer.default_normalizer', $config['fallback_normalizer']);
+            $priority = count($config['normalizers']);
+            foreach ($config['normalizers'] as $normalizer) {
+                $normalizer = $container->getDefinition($normalizer);
+                $normalizer->addTag('jms_serializer.normalizer', array('priority' => $priority--));
             }
 
             $container->setAlias('fos_rest.serializer', 'serializer');
         } else {
-            $loader->load('serializer.xml');
-
-            $container->setParameter($this->getAlias().'.normalizers', $config['normalizers']);
-            foreach ($config['default_normalizers'] as $key => $normalizer) {
-                if (!$normalizer) {
-                    unset($config['default_normalizers'][$key]);
-                }
-            }
-            $container->setParameter($this->getAlias().'.default_normalizers', $config['default_normalizers']);
+            $serializer = $container->getDefinition('fos_rest.serializer');
 
-            if (null ===  $config['fallback_normalizer']) {
-                $config['fallback_normalizer'] = 'fos_rest.noop_normalizer';
+            foreach ($config['formats'] as $format => $encoder) {
+                $serializer->addMethodCall('setEncoder', array($format, new Reference($encoder)));
             }
 
-            if ($config['fallback_normalizer']) {
-                $definition = $container->getDefinition('fos_rest.serializer');
-                $reference = new Reference($config['fallback_normalizer'], ContainerInterface::EXCEPTION_ON_INVALID_REFERENCE, false);
-                $definition->replaceArgument(3, $reference);
+            foreach ($config['normalizers'] as $normalizer) {
+                $serializer->addMethodCall('addNormalizer', array(new Reference($normalizer)));
             }
-            $container->setParameter($this->getAlias().'.fallback_normalizer', $config['fallback_normalizer']);
         }
 
         foreach ($config['exception']['codes'] as $exception => $code) {

diff --git a/README.md b/README.md
@@ -87,10 +87,7 @@ support for xml.
 Also the default JSON encoder class is modified and a custom serializer service
 is configured.
 
-The a normalizer is registered for the class ``Acme\HelloBundle\Document\Article``
-and the ``fos_rest.get_set_method_normalizer`` normalizer will be loazy loaded as
-soon as normalization is triggered. If no matching normalizer is found a last
-attempt is made with the ``fos_rest.pass_thru_normalizer``.
+The a default normalizer is registered with the ``fos_rest.get_set_method_normalizer`.
 
 Also a default key for any form instances inside view parameters is set to ``form``.
 
@@ -102,10 +99,7 @@ Finally the HTTP response status code for failed validation is set to ``400``:
             rss: my.encoder.rss
             xml: false
         normalizers:
-            "Acme\HelloBundle\Document\Article": "my.article_normalizer"
-        default_normalizers:
             - "fos_rest.get_set_method_normalizer"
-        fallback_normalizer: 'fos_rest.pass_thru_normalizer'
         default_form_key: form
         failed_validation: HTTP_BAD_REQUEST
 

diff --git a/Resources/config/serializer.xml b/Resources/config/serializer.xml
diff --git a/Resources/config/view.xml b/Resources/config/view.xml
@@ -31,6 +31,8 @@
             </call>
         </service>
 
+        <service id="fos_rest.serializer" class="%fos_rest.serializer.class%" />
+
         <service id="fos_rest.view" class="%fos_rest.view.class%">
             <argument>%fos_rest.formats%</argument>
             <argument>%fos_rest.failed_validation%</argument>

diff --git a/Serializer/Serializer.php b/Serializer/Serializer.php