Add path separator knowledge for all node definitions

bburnichon · bburnichon · commit 9f680c62e613 · 2017-04-05T11:46:34.000+02:00
diff --git a/src/Symfony/Component/Config/Definition/Builder/BooleanNodeDefinition.php b/src/Symfony/Component/Config/Definition/Builder/BooleanNodeDefinition.php
@@ -38,7 +38,7 @@ public function __construct($name, NodeParentInterface $parent = null)
      */
     protected function instantiateNode()
     {
-        return new BooleanNode($this->name, $this->parent);
+        return new BooleanNode($this->name, $this->parent, $this->getPathSeparator());
     }
 
     /**
diff --git a/src/Symfony/Component/Config/Definition/Builder/EnumNodeDefinition.php b/src/Symfony/Component/Config/Definition/Builder/EnumNodeDefinition.php
@@ -53,6 +53,6 @@ protected function instantiateNode()
             throw new \RuntimeException('You must call ->values() on enum nodes.');
         }
 
-        return new EnumNode($this->name, $this->parent, $this->values);
+        return new EnumNode($this->name, $this->parent, $this->values, $this->getPathSeparator());
     }
 }
diff --git a/src/Symfony/Component/Config/Definition/Builder/FloatNodeDefinition.php b/src/Symfony/Component/Config/Definition/Builder/FloatNodeDefinition.php
@@ -27,6 +27,6 @@ class FloatNodeDefinition extends NumericNodeDefinition
      */
     protected function instantiateNode()
     {
-        return new FloatNode($this->name, $this->parent, $this->min, $this->max);
+        return new FloatNode($this->name, $this->parent, $this->min, $this->max, $this->getPathSeparator());
     }
 }
diff --git a/src/Symfony/Component/Config/Definition/Builder/IntegerNodeDefinition.php b/src/Symfony/Component/Config/Definition/Builder/IntegerNodeDefinition.php
@@ -27,6 +27,6 @@ class IntegerNodeDefinition extends NumericNodeDefinition
      */
     protected function instantiateNode()
     {
-        return new IntegerNode($this->name, $this->parent, $this->min, $this->max);
+        return new IntegerNode($this->name, $this->parent, $this->min, $this->max, $this->getPathSeparator());
     }
 }
diff --git a/src/Symfony/Component/Config/Definition/Builder/NodeDefinition.php b/src/Symfony/Component/Config/Definition/Builder/NodeDefinition.php
@@ -20,7 +20,7 @@
  *
  * @author Johannes M. Schmitt <schmittjoh@gmail.com>
  */
-abstract class NodeDefinition implements NodeParentInterface, PathSeparatorAwareInterface
+abstract class NodeDefinition implements NodeParentInterface
 {
     private $pathSeparator = BaseNode::DEFAULT_PATH_SEPARATOR;
     protected $name;
@@ -344,7 +344,11 @@ protected function normalization()
     abstract protected function createNode();
 
     /**
+     * Set PathSeparator to use
+     *
      * @param string $separator
+     *
+     * @return $this
      */
     public function setPathSeparator($separator)
     {
@@ -355,6 +359,8 @@ public function setPathSeparator($separator)
         }
 
         $this->pathSeparator = $separator;
+
+        return $this;
     }
 
     /**
diff --git a/src/Symfony/Component/Config/Definition/Builder/PathSeparatorAwareInterface.php b/src/Symfony/Component/Config/Definition/Builder/PathSeparatorAwareInterface.php
diff --git a/src/Symfony/Component/Config/Definition/Builder/ScalarNodeDefinition.php b/src/Symfony/Component/Config/Definition/Builder/ScalarNodeDefinition.php
@@ -27,6 +27,6 @@ class ScalarNodeDefinition extends VariableNodeDefinition
      */
     protected function instantiateNode()
     {
-        return new ScalarNode($this->name, $this->parent);
+        return new ScalarNode($this->name, $this->parent, $this->getPathSeparator());
     }
 }
diff --git a/src/Symfony/Component/Config/Definition/Builder/TreeBuilder.php b/src/Symfony/Component/Config/Definition/Builder/TreeBuilder.php
@@ -57,13 +57,31 @@ public function root($name, $type = 'array', NodeBuilder $builder = null)
      */
     public function buildTree()
     {
-        if (null === $this->root) {
-            throw new \RuntimeException('The configuration tree has no root node.');
-        }
+        $this->assertTreeHasRootNode();
         if (null !== $this->tree) {
             return $this->tree;
         }
 
         return $this->tree = $this->root->getNode(true);
     }
+
+    public function setPathSeparator($separator)
+    {
+        $this->assertTreeHasRootNode();
+
+        // unset last built as changing path separator changes all nodes
+        $this->tree = null;
+
+        $this->root->setPathSeparator($separator);
+    }
+
+    /**
+     * @throws \RuntimeException if root node is not defined.
+     */
+    private function assertTreeHasRootNode()
+    {
+        if (null === $this->root) {
+            throw new \RuntimeException('The configuration tree has no root node.');
+        }
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@ public function __construct($name, NodeParentInterface $parent = null)`
`38`	`38`	`*/`
`39`	`39`	`protected function instantiateNode()`
`40`	`40`	`{`
`41`		`- return new BooleanNode($this->name, $this->parent);`
	`41`	`+ return new BooleanNode($this->name, $this->parent, $this->getPathSeparator());`
`42`	`42`	`}`
`43`	`43`
`44`	`44`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -53,6 +53,6 @@ protected function instantiateNode()`
`53`	`53`	`throw new \RuntimeException('You must call ->values() on enum nodes.');`
`54`	`54`	`}`
`55`	`55`
`56`		`- return new EnumNode($this->name, $this->parent, $this->values);`
	`56`	`+ return new EnumNode($this->name, $this->parent, $this->values, $this->getPathSeparator());`
`57`	`57`	`}`
`58`	`58`	`}`
Original file line number	Diff line number	Diff line change
`@@ -27,6 +27,6 @@ class FloatNodeDefinition extends NumericNodeDefinition`
`27`	`27`	`*/`
`28`	`28`	`protected function instantiateNode()`
`29`	`29`	`{`
`30`		`- return new FloatNode($this->name, $this->parent, $this->min, $this->max);`
	`30`	`+ return new FloatNode($this->name, $this->parent, $this->min, $this->max, $this->getPathSeparator());`
`31`	`31`	`}`
`32`	`32`	`}`
Original file line number	Diff line number	Diff line change
`@@ -27,6 +27,6 @@ class IntegerNodeDefinition extends NumericNodeDefinition`
`27`	`27`	`*/`
`28`	`28`	`protected function instantiateNode()`
`29`	`29`	`{`
`30`		`- return new IntegerNode($this->name, $this->parent, $this->min, $this->max);`
	`30`	`+ return new IntegerNode($this->name, $this->parent, $this->min, $this->max, $this->getPathSeparator());`
`31`	`31`	`}`
`32`	`32`	`}`< 10000 div aria-hidden="true" class="position-absolute top-0 d-flex user-select-none DiffLineTableCellParts-module__comment-indicator--eI0hb">
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@`
`20`	`20`	`*`
`21`	`21`	`* @author Johannes M. Schmitt <schmittjoh@gmail.com>`
`22`	`22`	`*/`
`23`		`-abstract class NodeDefinition implements NodeParentInterface, PathSeparatorAwareInterface`
	`23`	`+abstract class NodeDefinition implements NodeParentInterface`
`24`	`24`	`{`
`25`	`25`	`private $pathSeparator = BaseNode::DEFAULT_PATH_SEPARATOR;`
`26`	`26`	`protected $name;`
`@@ -344,7 +344,11 @@ protected function normalization()`
`344`	`344`	`abstract protected function createNode();`
`345`	`345`
`346`	`346`	`/**`
	`347`	`+ * Set PathSeparator to use`
	`348`	`+ *`
`347`	`349`	`* @param string $separator`
	`350`	`+ *`
	`351`	`+ * @return $this`
`348`	`352`	`*/`
`349`	`353`	`public function setPathSeparator($separator)`
`350`	`354`	`{`
`@@ -355,6 +359,8 @@ public function setPathSeparator($separator)`
`355`	`359`	`}`
`356`	`360`
`357`	`361`	`$this->pathSeparator = $separator;`
	`362`	`+`
	`363`	`+ return $this;`
`358`	`364`	`}`
`359`	`365`
`360`	`366`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -27,6 +27,6 @@ class ScalarNodeDefinition extends VariableNodeDefinition`
`27`	`27`	`*/`
`28`	`28`	`protected function instantiateNode()`
`29`	`29`	`{`
`30`		`- return new ScalarNode($this->name, $this->parent);`
	`30`	`+ return new ScalarNode($this->name, $this->parent, $this->getPathSeparator());`
`31`	`31`	`}`
`32`	`32`	`}`