Merge branch '2.7' into 2.8

* 2.7:
  add dependency on Twig
  [Config] Do not skip YamlReferenceDumperTest entirely
  [Config] Fix YamlReferenceDumper extra space

Author: fabpot

src/Symfony/Bundle/WebProfilerBundle/composer.json

@@ -19,7 +19,8 @@
         "php": ">=5.3.9",
         "symfony/http-kernel": "~2.4|~3.0.0",
         "symfony/routing": "~2.2|~3.0.0",
-        "symfony/twig-bridge": "~2.7|~3.0.0"
+        "symfony/twig-bridge": "~2.7|~3.0.0",
+        "twig/twig": "~1.28|~2.0"
     },
     "require-dev": {
         "symfony/config": "~2.2|~3.0.0",

src/Symfony/Component/Config/Definition/Dumper/YamlReferenceDumper.php

@@ -125,7 +125,7 @@ private function writeNode(NodeInterface $node, $depth = 0)
         $default = (string) $default != '' ? ' '.$default : '';
         $comments = count($comments) ? '# '.implode(', ', $comments) : '';
 
-        $text = rtrim(sprintf('%-20s %s %s', $node->getName().':', $default, $comments), ' ');
+        $text = rtrim(sprintf('%-21s%s %s', $node->getName().':', $default, $comments), ' ');
 
         if ($info = $node->getInfo()) {
             $this->writeLine('');

src/Symfony/Component/Config/Tests/Definition/Dumper/XmlReferenceDumperTest.php

@@ -49,6 +49,7 @@ private function getConfigurationAsString()
     scalar-array-empty=""
     scalar-array-defaults="elem1,elem2"
     scalar-required=""
+    node-with-a-looong-name=""
     enum-with-default="this"
     enum=""
 >

src/Symfony/Component/Config/Tests/Definition/Dumper/YamlReferenceDumperTest.php

@@ -22,8 +22,8 @@ public function testDumper()
 
         $dumper = new YamlReferenceDumper();
 
+        $this->assertContains($this->getConfigurationAsString(), $dumper->dump($configuration));
         $this->markTestIncomplete('The Yaml Dumper currently does not support prototyped arrays');
-        $this->assertEquals($this->getConfigurationAsString(), $dumper->dump($configuration));
     }
 
     private function getConfigurationAsString()
@@ -32,7 +32,7 @@ private function getConfigurationAsString()
 acme_root:
     boolean:              true
     scalar_empty:         ~
-    scalar_null:          ~
+    scalar_null:          null
     scalar_true:          true
     scalar_false:         false
     scalar_default:       default
@@ -43,6 +43,7 @@ private function getConfigurationAsString()
         - elem1
         - elem2
     scalar_required:      ~ # Required
+    node_with_a_looong_name: ~
     enum_with_default:    this # One of "this"; "that"
     enum:                 ~ # One of "this"; "that"
 
@@ -59,10 +60,6 @@ enum:                 ~ # One of "this"; "that"
 
         # Prototype: Parameter name
         name:                 ~
-    connections:
-        # Prototype
-        - { user: ~, pass: ~ }
-
 EOL;
     }
 }

src/Symfony/Component/Config/Tests/Fixtures/Configuration/ExampleConfiguration.php

@@ -34,6 +34,7 @@ public function getConfigTreeBuilder()
                 ->scalarNode('scalar_array_empty')->defaultValue(array())->end()
                 ->scalarNode('scalar_array_defaults')->defaultValue(array('elem1', 'elem2'))->end()
                 ->scalarNode('scalar_required')->isRequired()->end()
+                ->scalarNode('node_with_a_looong_name')->end()
                 ->enumNode('enum_with_default')->values(array('this', 'that'))->defaultValue('this')->end()
                 ->enumNode('enum')->values(array('this', 'that'))->end()
                 ->arrayNode('array')