From 7a9243a220577f6ec5979e82807a6d7a5d23fd8e Mon Sep 17 00:00:00 2001 From: Ryan Weaver Date: Fri, 18 Feb 2011 06:59:35 -0600 Subject: [PATCH] [Config] Making changes per the recent movement of the Config builder into the Config component. --- .../Tests/Component/Config/Definition/ArrayNodeTest.php | 2 +- .../Definition}/Builder/NodeBuilderTest.php | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) rename tests/Symfony/Tests/Component/{DependencyInjection/Configuration => Config/Definition}/Builder/NodeBuilderTest.php (57%) diff --git a/tests/Symfony/Tests/Component/Config/Definition/ArrayNodeTest.php b/tests/Symfony/Tests/Component/Config/Definition/ArrayNodeTest.php index 91220e80fa..c363325a60 100644 --- a/tests/Symfony/Tests/Component/Config/Definition/ArrayNodeTest.php +++ b/tests/Symfony/Tests/Component/Config/Definition/ArrayNodeTest.php @@ -54,7 +54,7 @@ class ArrayNodeTest extends \PHPUnit_Framework_TestCase // finalizeValue() should protect against child values with no corresponding node public function testExceptionThrownOnUnrecognizedChild() { - $this->setExpectedException('Symfony\Component\DependencyInjection\Configuration\Exception\InvalidConfigurationException'); + $this->setExpectedException('Symfony\Component\Config\Definition\Exception\InvalidConfigurationException'); $node = new ArrayNode('root'); $node->normalize(array('foo' => 'bar')); } diff --git a/tests/Symfony/Tests/Component/DependencyInjection/Configuration/Builder/NodeBuilderTest.php b/tests/Symfony/Tests/Component/Config/Definition/Builder/NodeBuilderTest.php similarity index 57% rename from tests/Symfony/Tests/Component/DependencyInjection/Configuration/Builder/NodeBuilderTest.php rename to tests/Symfony/Tests/Component/Config/Definition/Builder/NodeBuilderTest.php index cf9b46df41..6c7da9753b 100644 --- a/tests/Symfony/Tests/Component/DependencyInjection/Configuration/Builder/NodeBuilderTest.php +++ b/tests/Symfony/Tests/Component/Config/Definition/Builder/NodeBuilderTest.php @@ -1,17 +1,17 @@ addNodeBuilder($childNode); + $ret = $nodeBuilder->nodeBuilder($childNode); $this->assertEquals(array('child' => $childNode), $nodeBuilder->children); $this->assertEquals($nodeBuilder, $ret); }