Revert "bug #18908 [DependencyInjection] force enabling the external XML entity loaders (xabbuh)"

nicolas-grekas · nicolas-grekas · commit 91635a805480 · 2016-05-30T10:31:06.000+02:00
This reverts commit 44f6f89, reversing changes made to 57d6053.
diff --git a/src/Symfony/Component/DependencyInjection/Loader/XmlFileLoader.php b/src/Symfony/Component/DependencyInjection/Loader/XmlFileLoader.php
@@ -333,9 +333,7 @@ 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);
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Loader/XmlFileLoaderTest.php b/src/Symfony/Component/DependencyInjection/Tests/Loader/XmlFileLoaderTest.php
@@ -83,19 +83,6 @@ 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,9 +333,7 @@ public function validateSchema(\DOMDocument $dom)`
`333`	`333`	`EOF`
`334`	`334`	`;`
`335`	`335`
`336`		`- $disableEntities = libxml_disable_entity_loader(false);`
`337`	`336`	`$valid = @$dom->schemaValidateSource($source);`
`338`		`- libxml_disable_entity_loader($disableEntities);`
`339`	`337`
`340`	`338`	`foreach ($tmpfiles as $tmpfile) {`
`341`	`339`	`@unlink($tmpfile);`