From d6617f6fba9f09d38e152341d8921d3844675fd9 Mon Sep 17 00:00:00 2001
From: Ryan Weaver <ryan@thatsquality.com>
Date: Fri, 18 Feb 2011 07:31:00 -0600
Subject: [PATCH] [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 | 2 +-
 .../Component/Config/Definition/Builder/NodeBuilderTest.php     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Symfony/Component/Config/Definition/Builder/NodeBuilder.php b/src/Symfony/Component/Config/Definition/Builder/NodeBuilder.php
index f77c7c520046..56a9b3e82176 100644
--- a/src/Symfony/Component/Config/Definition/Builder/NodeBuilder.php
+++ b/src/Symfony/Component/Config/Definition/Builder/NodeBuilder.php
@@ -116,7 +116,7 @@ public function node($name, $type)
      *
      * @return Symfony\Component\DependencyInjection\Configuration\Builder\NodeBuilder This builder node
      */
-    public function nodeBuilder(NodeBuilder $node)
+    public function builder(NodeBuilder $node)
     {
         $node->parent = $this;
 
diff --git a/tests/Symfony/Tests/Component/Config/Definition/Builder/NodeBuilderTest.php b/tests/Symfony/Tests/Component/Config/Definition/Builder/NodeBuilderTest.php
index 6c7da9753b78..33bd14ace7e5 100644
--- a/tests/Symfony/Tests/Component/Config/Definition/Builder/NodeBuilderTest.php
+++ b/tests/Symfony/Tests/Component/Config/Definition/Builder/NodeBuilderTest.php
@@ -11,7 +11,7 @@ public function testNodeBuilder()
         $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);
     }