symfony
diff --git a/‎src/Symfony/Component/DependencyInjection/Loader/XmlFileLoader.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/DependencyInjection/Loader/XmlFileLoader.php
+2Lines changed: 2 additions & 0 deletions b/‎src/Symfony/Component/DependencyInjection/Loader/XmlFileLoader.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/DependencyInjection/Loader/XmlFileLoader.php
+2Lines changed: 2 additions & 0 deletions
diff --git a/‎src/Symfony/Component/DependencyInjection/Tests/Loader/XmlFileLoaderTest.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/DependencyInjection/Tests/Loader/XmlFileLoaderTest.php
+13Lines changed: 13 additions & 0 deletions b/‎src/Symfony/Component/DependencyInjection/Tests/Loader/XmlFileLoaderTest.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/DependencyInjection/Tests/Loader/XmlFileLoaderTest.php
+13Lines changed: 13 additions & 0 deletions
@@ -333,7 +333,9 @@ public function validateSchema(\DOMDocument $dom)
 EOF
         ;
 
+        $disableEntities = libxml_disable_entity_loader(false);
         $valid = @$dom->schemaValidateSource($source);
+        libxml_disable_entity_loader($disableEntities);
 
         foreach ($tmpfiles as $tmpfile) {
             @unlink($tmpfile);
 
@@ -83,6 +83,19 @@ public function testParseFile()
         $this->assertInstanceOf('Symfony\\Component\\DependencyInjection\\SimpleXMLElement', $xml, '->parseFile() returns an SimpleXMLElement object');
     }
 
+    public function testLoaderTurnsOnEntityLoaderIfNecessary()
+    {
+        $oldValue = libxml_disable_entity_loader(true);
+
+        $containerBuilder = new ContainerBuilder();
+        $loader = new XmlFileLoader($containerBuilder, new FileLocator(self::$fixturesPath.'/xml'));
+        $loader->load('services2.xml');
+
+        libxml_disable_entity_loader($oldValue);
+
+        $this->assertTrue(count($containerBuilder->getParameterBag()->all()) > 0, 'Parameters can be read from the config file.');
+    }
+
     public function testLoadParameters()
     {
         $container = new ContainerBuilder();
Original file line number	Diff line number	Diff line change
`@@ -333,7 +333,9 @@ public function validateSchema(\DOMDocument $dom)`
`333`	`333`	`EOF`
`334`	`334`	`;`
`335`	`335`
	`336`	`+ $disableEntities = libxml_disable_entity_loader(false);`
`336`	`337`	`$valid = @$dom->schemaValidateSource($source);`
	`338`	`+ libxml_disable_entity_loader($disableEntities);`
`337`	`339`
`338`	`340`	`foreach ($tmpfiles as $tmpfile) {`
`339`	`341`	`@unlink($tmpfile);`