Merge branch '2.3' into 2.6

fabpot · fabpot · commit d609e4e313e6 · 2015-03-17T13:43:30.000+01:00
* 2.3:
  remove unused code
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Dumper/XmlDumperTest.php b/src/Symfony/Component/DependencyInjection/Tests/Dumper/XmlDumperTest.php
@@ -25,12 +25,9 @@ public static function setUpBeforeClass()
 
     public function testDump()
     {
-        $dumper = new XmlDumper($container = new ContainerBuilder());
+        $dumper = new XmlDumper(new ContainerBuilder());
 
         $this->assertXmlStringEqualsXmlFile(self::$fixturesPath.'/xml/services1.xml', $dumper->dump(), '->dump() dumps an empty container as an empty XML file');
-
-        $container = new ContainerBuilder();
-        $dumper = new XmlDumper($container);
     }
 
     public function testExportParameters()

Original file line number	Diff line number	Diff line change
`@@ -25,12 +25,9 @@ public static function setUpBeforeClass()`
`25`	`25`
`26`	`26`	`public function testDump()`
`27`	`27`	`{`
`28`		`- $dumper = new XmlDumper($container = new ContainerBuilder());`
	`28`	`+ $dumper = new XmlDumper(new ContainerBuilder());`
`29`	`29`
`30`	`30`	`$this->assertXmlStringEqualsXmlFile(self::$fixturesPath.'/xml/services1.xml', $dumper->dump(), '->dump() dumps an empty container as an empty XML file');`
`31`		`-`
`32`		`- $container = new ContainerBuilder();`
`33`		`- $dumper = new XmlDumper($container);`
`34`	`31`	`}`
`35`	`32`
`36`	`33`	`public function testExportParameters()`