Merge pull request #920 from gou1/body-listener-format-fallback

BodyListener default format in case no Content-Type is provided

Author: lsmith77

DependencyInjection/Configuration.php

@@ -168,6 +168,7 @@ private function addBodyListenerSection(ArrayNodeDefinition $rootNode)
                     ->addDefaultsIfNotSet()
                     ->canBeUnset()
                     ->children()
+                        ->scalarNode('default_format')->defaultNull()->end()
                         ->booleanNode('throw_exception_on_unsupported_content_type')
                             ->defaultFalse()
                         ->end()

DependencyInjection/FOSRestExtension.php

@@ -156,6 +156,7 @@ public function load(array $configs, ContainerBuilder $container)
             $loader->load('body_listener.xml');
 
             $container->setParameter($this->getAlias().'.throw_exception_on_unsupported_content_type', $config['body_listener']['throw_exception_on_unsupported_content_type']);
+            $container->setParameter($this->getAlias().'.body_default_format', $config['body_listener']['default_format']);
             $container->setParameter($this->getAlias().'.decoders', $config['body_listener']['decoders']);
 
             $arrayNormalizer = $config['body_listener']['array_normalizer'];

EventListener/BodyListener.php

@@ -28,6 +28,7 @@ class BodyListener
 {
     private $decoderProvider;
     private $throwExceptionOnUnsupportedContentType;
+    private $defaultFormat;
 
     /**
      * @var ArrayNormalizerInterface
@@ -56,6 +57,16 @@ public function setArrayNormalizer(ArrayNormalizerInterface $arrayNormalizer)
         $this->arrayNormalizer = $arrayNormalizer;
     }
 
+    /**
+     * Sets the fallback format if there's no Content-Type in the request.
+     *
+     * @param string $defaultFormat
+     */
+    public function setDefaultFormat($defaultFormat)
+    {
+        $this->defaultFormat = $defaultFormat;
+    }
+
     /**
      * Core request handler.
      *
@@ -78,6 +89,8 @@ public function onKernelRequest(GetResponseEvent $event)
                 ? $request->getRequestFormat()
                 : $request->getFormat($contentType);
 
+            $format = $format ?: $this->defaultFormat;
+
             $content = $request->getContent();
 
             if (!$this->decoderProvider->supports($format)) {

Resources/config/body_listener.xml

@@ -36,6 +36,9 @@
             <tag name="kernel.event_listener" event="kernel.request" method="onKernelRequest" priority="10" />
             <argument type="service" id="fos_rest.decoder_provider" />
             <argument>%fos_rest.throw_exception_on_unsupported_content_type%</argument>
+            <call method="setDefaultFormat">
+                <argument>%fos_rest.body_default_format%</argument>
+            </call>
         </service>
 
     </services>

Resources/doc/configuration-reference.md

@@ -67,6 +67,7 @@ fos_rest:
             # Prototype
             name:                 ~
     body_listener:
+        default_format: null     
         throw_exception_on_unsupported_content_type:  false
         decoders: