symfony · inelgnu · Mar 3, 2014 · Mar 4, 2014
diff --git a/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/Descriptor.php b/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/Descriptor.php
@@ -114,17 +114,6 @@ abstract protected function describeRouteCollection(RouteCollection $routes, arr
      */
     abstract protected function describeRoute(Route $route, array $options = array());
 
-    /**
-     * Describes a specific container parameter.
-     *
-     * @param mixed $parameterValue
-     * @param array $options
-     */
-    protected function describeContainerParameter($parameterValue, array $options = array())
-    {
-        $this->write($this->formatParameter($parameterValue));
-    }
-
     /**
      * Describes container parameters.
      *
@@ -179,6 +168,14 @@ abstract protected function describeContainerDefinition(Definition $definition,
      */
     abstract protected function describeContainerAlias(Alias $alias, array $options = array());
 
+    /**
+     * Describes a container parameter.
+     *
+     * @param parameter
+     * @param array $options
+     */
+    abstract protected function describeContainerParameter($parameter, array $options = array());
+
     /**
      * Formats a value as string.
      *

diff --git a/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/JsonDescriptor.php b/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/JsonDescriptor.php
@@ -134,6 +134,16 @@ protected function describeContainerAlias(Alias $alias, array $options = array()
         $this->writeData($this->getContainerAliasData($alias), $options);
     }
 
+    /**
+     * {@inheritdoc}
+     */
+    protected function describeContainerParameter($parameter, array $options = array())
+    {
+        $key = isset($options['parameter']) ? $options['parameter'] : '';
+
+        $this->writeData(array($key => $this->formatParameter($parameter)), $options);
+    }
+
     /**
      * Writes data as json.
      *

diff --git a/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/MarkdownDescriptor.php b/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/MarkdownDescriptor.php
@@ -207,6 +207,14 @@ protected function describeContainerAlias(Alias $alias, array $options = array()
         $this->write(isset($options['id']) ? sprintf("%s\n%s\n\n%s\n", $options['id'], str_repeat('~', strlen($options['id'])), $output) : $output);
     }
 
+    /**
+     * {@inheritdoc}
+     */
+    protected function describeContainerParameter($parameter, array $options = array())
+    {
+        $this->write(isset($options['parameter']) ? sprintf("%s\n%s\n\n%s", $options['parameter'], str_repeat('=', strlen($options['parameter'])), $this->formatParameter($parameter)): $parameter);
+    }
+
     private function formatRouterConfig(array $array)
     {
         if (!count($array)) {

diff --git a/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/TextDescriptor.php b/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/TextDescriptor.php
@@ -276,6 +276,14 @@ protected function describeContainerAlias(Alias $alias, array $options = array()
         $this->writeText(sprintf('This service is an alias for the service <info>%s</info>', (string) $alias), $options);
     }
 
+    /**
+     * {@inheritdoc}
+     */
+    protected function describeContainerParameter($parameter, array $options = array())
+    {
+        $this->writeText($this->formatParameter($parameter), $options);
+    }
+
     /**
      * @param array $array
      *

diff --git a/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/XmlDescriptor.php b/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/XmlDescriptor.php
@@ -91,6 +91,14 @@ protected function describeContainerAlias(Alias $alias, array $options = array()
         $this->writeDocument($this->getContainerAliasDocument($alias, isset($options['id']) ? $options['id'] : null));
     }
 
+    /**
+     * {@inheritdoc}
+     */
+    protected function describeContainerParameter($parameter, array $options = array())
+    {
+        $this->writeDocument($this->getContainerParameterDocument($parameter, $options));
+    }
+
     /**
      * Writes DOM document.
      *
@@ -365,4 +373,24 @@ private function getContainerAliasDocument(Alias $alias, $id = null)
 
         return $dom;
     }
+
+    /**
+     * @param $parameter
+     * @param array $options
+     *
+     * @return \DOMDocument
+     */
+    private function getContainerParameterDocument($parameter, $options = array())
+    {
+        $dom = new \DOMDocument('1.0', 'UTF-8');
+        $dom->appendChild($parameterXML = $dom->createElement('parameter'));
+
+        if (isset($options['parameter'])) {
+            $parameterXML->setAttribute('key', $options['parameter']);
+        }
+
+        $parameterXML->appendChild(new \DOMText($this->formatParameter($parameter)));
+
+        return $dom;
+    }
 }
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Console/Descriptor/AbstractDescriptorTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Console/Descriptor/AbstractDescriptorTest.php
@@ -87,6 +87,21 @@ public function getDescribeContainerAliasTestData()
         return $this->getDescriptionTestData(ObjectsProvider::getContainerAliases());
     }
 
+    /** @dataProvider getDescribeContainerParameterTestData */
+    public function testDescribeContainerParameter($parameter, $expectedDescription, array $options)
+    {
+        $this->assertDescription($expectedDescription, $parameter, $options);
+    }
+
+    public function getDescribeContainerParameterTestData()
+    {
+        $data = $this->getDescriptionTestData(ObjectsProvider::getContainerParameter());
+
+        array_push($data[0], array('parameter' => 'database_name'));
+
+        return $data;
+    }
+
     abstract protected function getDescriptor();
     abstract protected function getFormat();
 

diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Console/Descriptor/ObjectsProvider.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Console/Descriptor/ObjectsProvider.php
@@ -66,6 +66,16 @@ public static function getContainerParameters()
         );
     }
 
+    public static function getContainerParameter()
+    {
+        $builder = new ContainerBuilder();
+        $builder->setParameter('database_name', 'symfony');
+
+        return array(
+            'parameter' =>  $builder
+        );
+    }
+
     public static function getContainerBuilders()
     {
         $builder1 = new ContainerBuilder();

diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/parameter.json b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/parameter.json
@@ -0,0 +1,3 @@
+{
+    "database_name": "symfony"
+}
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/parameter.md b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/parameter.md
@@ -0,0 +1,4 @@
+database_name
+=============
+
+symfony
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/parameter.txt b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/parameter.txt
@@ -0,0 +1 @@
+symfony
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/parameter.xml b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/parameter.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<parameter key="database_name">symfony</parameter>
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		<?xml version="1.0" encoding="UTF-8"?>
		<parameter key="database_name">symfony</parameter>