Merge branch 'emodric-issue_29_fix'

Author: matthiasnoback

Partial/PartialNode.php

@@ -39,13 +39,8 @@ public static function excludeEverythingNotInPath(ArrayNode $node, array $path =
         }
 
         $nextNodeName = array_shift($path);
-
         $nextNode = self::childNode($node, $nextNodeName);
 
-        if (!($nextNode instanceof ArrayNode)) {
-            throw new ChildIsNotAnArrayNode($node, $nextNodeName);
-        }
-
         $children = self::nodeChildrenProperty()->getValue($node);
         foreach ($children as $name => $child) {
             if ($name !== $nextNodeName) {
@@ -54,6 +49,14 @@ public static function excludeEverythingNotInPath(ArrayNode $node, array $path =
         }
         self::nodeChildrenProperty()->setValue($node, $children);
 
+        if (!($nextNode instanceof ArrayNode)) {
+            if (!empty($path)) {
+                throw new ChildIsNotAnArrayNode($node, $nextNodeName);
+            }
+
+            return;
+        }
+
         self::excludeEverythingNotInPath($nextNode, $path);
     }
 

Tests/Partial/PartialNodeTest.php

@@ -73,6 +73,33 @@ public function it_strips_children_that_are_not_in_the_given_path_with_several_n
         $this->nodeOnlyHasChild($node1, 'node_1_b');
     }
 
+    /**
+     * @test
+     */
+    public function it_strips_children_when_leaf_node_is_not_an_array()
+    {
+        $treeBuilder = new TreeBuilder();
+        $root = $treeBuilder->root('root');
+        $root
+            ->children()
+                ->arrayNode('node_1')
+                    ->children()
+                        ->scalarNode('node_1_scalar_node')
+                        ->end()
+                    ->end()
+                ->end()
+                ->scalarNode('node_2')
+                ->end()
+                ->scalarNode('node_3');
+
+        $node = $treeBuilder->buildTree();
+        /** @var ArrayNode $node */
+
+        PartialNode::excludeEverythingNotInPath($node, array('node_3'));
+
+        $this->nodeOnlyHasChild($node, 'node_3');
+    }
+
     /**
      * @test
      */
@@ -98,7 +125,7 @@ public function it_fails_when_a_requested_child_node_does_not_exist()
     /**
      * @test
      */
-    public function it_fails_when_a_requested_child_node_is_no_array_node_itself()
+    public function it_fails_when_a_requested_child_node_is_no_array_node_itself_and_path_not_empty()
     {
         $treeBuilder = new TreeBuilder();
         $root = $treeBuilder->root('root');
@@ -114,7 +141,7 @@ public function it_fails_when_a_requested_child_node_is_no_array_node_itself()
             'Matthias\SymfonyConfigTest\Partial\Exception\ChildIsNotAnArrayNode',
             'Child node "scalar_node" is not an array node (current path: "root.sub_node")'
         );
-        PartialNode::excludeEverythingNotInPath($node, array('sub_node', 'scalar_node'));
+        PartialNode::excludeEverythingNotInPath($node, array('sub_node', 'scalar_node', 'extra_node'));
     }
 
     private function nodeOnlyHasChild(ArrayNode $node, $nodeName)