JsonDescriptor - encode container params only once

src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/JsonDescriptor.php

@@ -157,7 +157,7 @@ class JsonDescriptor extends Descriptor
     {
         $key = isset($options['parameter']) ? $options['parameter'] : '';
 
-        $this->writeData(array($key => $this->formatParameter($parameter)), $options);
+        $this->writeData(array($key => $parameter), $options);
     }
 
     /**

src/Symfony/Bundle/FrameworkBundle/Tests/Console/Descriptor/AbstractDescriptorTest.php

@@ -113,6 +113,7 @@ abstract class AbstractDescriptorTest extends \PHPUnit_Framework_TestCase
         $data = $this->getDescriptionTestData(ObjectsProvider::getContainerParameter());
 
         $data[0][] = array('parameter' => 'database_name');
+        $data[1][] = array('parameter' => 'twig.form.resources');
 
         return $data;
     }

src/Symfony/Bundle/FrameworkBundle/Tests/Console/Descriptor/ObjectsProvider.php

@@ -72,9 +72,16 @@ class ObjectsProvider
     {
         $builder = new ContainerBuilder();
         $builder->setParameter('database_name', 'symfony');
+        $builder->setParameter('twig.form.resources', array(
+            'bootstrap_3_horizontal_layout.html.twig',
+            'bootstrap_3_layout.html.twig',
+            'form_div_layout.html.twig',
+            'form_table_layout.html.twig',
+        ));
 
         return array(
             'parameter' => $builder,
+            'array_parameter' => $builder,
         );
     }
 

src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/array_parameter.json

@@ -0,0 +1,3 @@
+{
+  "twig.form.resources": ["bootstrap_3_horizontal_layout.html.twig", "bootstrap_3_layout.html.twig", "form_div_layout.html.twig", "form_table_layout.html.twig"]
+}

src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/array_parameter.md

@@ -0,0 +1,4 @@
+twig.form.resources
+===================
+
+["bootstrap_3_horizontal_layout.html.twig","bootstrap_3_layo...

src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/array_parameter.txt

@@ -0,0 +1 @@
+["bootstrap_3_horizontal_layout.html.twig","bootstrap_3_layo...

src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/array_parameter.xml

@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<parameter key="twig.form.resources">["bootstrap_3_horizontal_layout.html.twig","bootstrap_3_layo...</parameter>