Make response format more configurable

DependencyInjection/Configuration.php

@@ -28,17 +28,20 @@ class Configuration implements ConfigurationInterface
                     ->children()
                         ->scalarNode('enabled')->defaultTrue()->end()
                         ->scalarNode('endpoint')->defaultValue('/app_dev.php')->end()
-                        ->enumNode('json_declaration_method')
+                        ->enumNode('request_format_method')
                             ->values(array('format_param', 'accept_header'))
                             ->defaultValue('format_param')
                         ->end()
                         ->arrayNode('authentication')
                             ->children()
                                 ->scalarNode('name')->isRequired()->end()
-                                ->enumNode('delivery')
+                                ->scalarNode('delivery')
-                                    // header|query|request, but only query is implemented for now
-                                    ->values(array('query'))
                                     ->isRequired()
+                                    ->validate()
+                                        // header|query|request, but only query is implemented for now
+                                        ->ifNotInArray(array('query'))
+                                        ->thenInvalid("Unknown authentication delivery type '%s'.")
+                                    ->end()
                                 ->end()
                             ->end()
                         ->end()

DependencyInjection/NelmioApiDocExtension.php

@@ -31,7 +31,7 @@ class NelmioApiDocExtension extends Extension
         $container->setParameter('nelmio_api_doc.api_name', $config['name']);
         $container->setParameter('nelmio_api_doc.sandbox.enabled',  $config['sandbox']['enabled']);
         $container->setParameter('nelmio_api_doc.sandbox.endpoint', $config['sandbox']['endpoint']);
-        $container->setParameter('nelmio_api_doc.sandbox.json_declaration_method', $config['sandbox']['json_declaration_method']);
+        $container->setParameter('nelmio_api_doc.sandbox.request_format_method', $config['sandbox']['request_format_method']);
 
         $loader = new XmlFileLoader($container, new FileLocator(__DIR__.'/../Resources/config'));
         $loader->load('formatters.xml');

Formatter/HtmlFormatter.php

@@ -43,7 +43,7 @@ class HtmlFormatter extends AbstractFormatter
     /**
      * @var string
      */
-    private $jsonDeclarationMethod;
+    private $requestFormatMethod;
 
     /**
      * @param array $authentication
@@ -88,9 +88,9 @@ class HtmlFormatter extends AbstractFormatter
     /**
      * @param string $method
      */
-    public function setJsonDeclarationMethod($method)
+    public function setRequestFormatMethod($method)
     {
-        $this->jsonDeclarationMethod = $method;
+        $this->requestFormatMethod = $method;
     }
 
     /**
@@ -150,7 +150,7 @@ class HtmlFormatter extends AbstractFormatter
             'authentication'      => $this->authentication,
             'endpoint'            => $this->endpoint,
             'enableSandbox'       => $this->enableSandbox,
-            'jsonDeclarationMethod' => $this->jsonDeclarationMethod,
+            'requestFormatMethod' => $this->requestFormatMethod,
             'date'                => date(DATE_RFC822),
             'css'                 => file_get_contents(__DIR__ . '/../Resources/public/css/screen.css'),
             'js'                  => file_get_contents(__DIR__ . '/../Resources/public/js/all.js'),

Resources/config/formatters.xml

@@ -37,8 +37,8 @@
             <call method="setEndpoint">
                 <argument>%nelmio_api_doc.sandbox.endpoint%</argument>
             </call>
-            <call method="setJsonDeclarationMethod">
+            <call method="setRequestFormatMethod">
-                <argument>%nelmio_api_doc.sandbox.json_declaration_method%</argument>
+                <argument>%nelmio_api_doc.sandbox.request_format_method%</argument>
             </call>
             <call method="setAuthentication">
                 <argument>%nelmio_api_doc.sandbox.authentication%</argument>

Resources/public/css/screen.css

@@ -148,7 +148,7 @@ table tbody tr:last-child td {
   text-decoration: none;
 }
 
-#api_key_wrapper {
+#sandbox_configuration {
     float: right;
     padding: 10px 0 10px 0;
 }

Resources/views/layout.html.twig

@@ -15,11 +15,16 @@
     <body>
         <div id="header">
             <a href=""><h1>{{ apiName }}</h1></a>
+            <div id="sandbox_configuration">
+                request format:
+                <select id="request_format">
+                    <option value="json">JSON</option>
+                    <option value="xml">XML</option>
+                </select>
                 {% if authentication %}
-            <div id="api_key_wrapper">
                     api key: <input type="text" id="api_key"/>
-            </div>
                 {% endif %}
+            </div>
             <br style="clear: both;" />
         </div>
         <div class="container" id="resources_container">
@@ -51,7 +56,7 @@
                     $btn = $container.parents('.pane').find('.to-raw');
 
                     $container.addClass('prettyprinted');
-                $container.html(rawData);
+                    $container.html($('<div/>').text(rawData).html());
 
                     $btn.removeClass('to-raw');
                     $btn.addClass('to-prettify');
@@ -105,11 +110,7 @@
 
                     container.data('raw-response', data);
 
-                    if ('<' === data[0]) {
-                        renderRawBody(container);
-                    } else {
                     renderPrettifiedBody(container);
-                    }
 
                     container.parents('.pane').find('.to-prettify').text('Raw');
                     container.parents('.pane').find('.to-raw').text('Raw');
@@ -136,14 +137,15 @@
                         self = this,
                         params = {},
                         headers = {},
-                        content = $(this).find('textarea.content').val();
+                        content = $(this).find('textarea.content').val(),
                         result_container = $('.result', $(this).parent());
 
-                    var jsonDeclarationMethod = '{{ jsonDeclarationMethod }}';
+                    var requestFormat = $('#request_format').val();
-                    if (jsonDeclarationMethod == 'format_param') {
+                    var requestFormatMethod = '{{ requestFormatMethod }}';
-                        params['_format'] = 'json';
+                    if (requestFormatMethod == 'format_param') {
-                    } else if (jsonDeclarationMethod == 'accept_header') {
+                        params['_format'] = requestFormat;
-                        headers['Accept'] = 'application/json';
+                    } else if (requestFormatMethod == 'accept_header') {
+                        headers['Accept'] = 'application/' + requestFormat;
                     }
 
                     // retrieve all the parameters to send