[Config] Renaming NodeBuilder::nodeBuilder() to NodeBuilder::builder() due to the fact that PHP can get confused when you have a __construct() method *and* a method that has the same name as the class (looks like two constructors to PHP).

src/Symfony/Component/Config/Definition/Builder/NodeBuilder.php

@@ -116,7 +116,7 @@ class NodeBuilder
      *
      * @return Symfony\Component\DependencyInjection\Configuration\Builder\NodeBuilder This builder node
      */
-    public function nodeBuilder(NodeBuilder $node)
+    public function builder(NodeBuilder $node)
     {
         $node->parent = $this;
 

tests/Symfony/Tests/Component/Config/Definition/Builder/NodeBuilderTest.php

@@ -11,7 +11,7 @@ class NodeBuilderTest extends \PHPUnit_Framework_TestCase
         $nodeBuilder = new NodeBuilder('root', array());
         $childNode = new NodeBuilder('child', array());
 
-        $ret = $nodeBuilder->nodeBuilder($childNode);
+        $ret = $nodeBuilder->builder($childNode);
         $this->assertEquals(array('child' => $childNode), $nodeBuilder->children);
         $this->assertEquals($nodeBuilder, $ret);
     }