[Config] Fix YamlReferenceDumper prototyped array support

symfony · ogizanagi · Aug 8, 2016 · Aug 8, 2016 · ca1352541c8eb5b71b2df5ce3234b6fd18032aaf
commit ca1352541c8eb5b71b2df5ce3234b6fd18032aaf
diff --git a/src/Symfony/Component/Config/Definition/Dumper/YamlReferenceDumper.php b/src/Symfony/Component/Config/Definition/Dumper/YamlReferenceDumper.php
@@ -45,8 +45,9 @@ public function dumpNode(NodeInterface $node)
    /**
     * @param NodeInterface $node
     * @param int           $depth
+     * @param bool          $prototypedArray
     */
-    private function writeNode(NodeInterface $node, $depth = 0)
+    private function writeNode(NodeInterface $node, $depth = 0, $prototypedArray = false)
    {
        $comments = array();
        $default = '';
@@ -66,17 +67,17 @@ private function writeNode(NodeInterface $node, $depth = 0)
                }

                // check for attribute as key
-                if ($key = $node->getKeyAttribute()) {
-                    $keyNodeClass = 'Symfony\Component\Config\Definition\\'.($prototype instanceof ArrayNode ? 'ArrayNode' : 'ScalarNode');
-                    $keyNode = new $keyNodeClass($key, $node);
-                    $keyNode->setInfo('Prototype');
-
-                    // add children
-                    foreach ($children as $childNode) {
-                        $keyNode->addChild($childNode);
-                    }
-                    $children = array($key => $keyNode);
+                $key = $node->getKeyAttribute();
+
+                $keyNodeClass = 'Symfony\Component\Config\Definition\\'.($prototype instanceof ArrayNode ? 'ArrayNode' : 'ScalarNode');
+                $keyNode = new $keyNodeClass($key, $node);
+                $keyNode->setInfo('Prototype');
+
+                // add children
+                foreach ($children as $childNode) {
+                    $keyNode->addChild($childNode);
                }
+                $children = array($key => $keyNode);
            }

            if (!$children) {
@@ -120,7 +121,8 @@ 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), ' ');
+        $key = $prototypedArray ? '-' : $node->getName().':';
+        $text = rtrim(sprintf('%-20s %s %s', $key, $default, $comments), ' ');

        if ($info = $node->getInfo()) {
            $this->writeLine('');
@@ -154,7 +156,7 @@ private function writeNode(NodeInterface $node, $depth = 0)

        if ($children) {
            foreach ($children as $childNode) {
-                $this->writeNode($childNode, $depth + 1);
+                $this->writeNode($childNode, $depth + 1, $node instanceof PrototypedArrayNode && !$node->getKeyAttribute());
            }
        }
    }

diff --git a/src/Symfony/Component/Config/Tests/Definition/Dumper/YamlReferenceDumperTest.php b/src/Symfony/Component/Config/Tests/Definition/Dumper/YamlReferenceDumperTest.php
@@ -22,7 +22,6 @@ public function testDumper()

        $dumper = new YamlReferenceDumper();

-        $this->markTestIncomplete('The Yaml Dumper currently does not support prototyped arrays');
        $this->assertEquals($this->getConfigurationAsString(), $dumper->dump($configuration));
    }

@@ -32,7 +31,7 @@ private function getConfigurationAsString()
 acme_root:
    boolean:              true
    scalar_empty:         ~
-    scalar_null:          ~
+    scalar_null:          null
    scalar_true:          true
    scalar_false:         false
    scalar_default:       default
@@ -60,8 +59,11 @@ enum:                 ~ # One of "this"; "that"
        # Prototype
        name:                 ~
    connections:
+
        # Prototype
-        - { user: ~, pass: ~ }
+        -
+            user:                 ~
+            pass:                 ~

 EOL;
    }