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

nicolas-grekas · nicolas-grekas · commit 44f6f8930838 · 2016-05-30T10:25:13.000+02:00
This PR was merged into the 2.3 branch. Discussion ---------- [DependencyInjection] force enabling the external XML entity loaders | Q | A | ------------- | --- | Branch? | 2.3 | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | #18876 | License | MIT | Doc PR | Commits ------- 142b1a4 force enabling the external XML entity loaders
diff --git a/src/Symfony/Component/DependencyInjection/Loader/XmlFileLoader.php b/src/Symfony/Component/DependencyInjection/Loader/XmlFileLoader.php
@@ -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);
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Loader/XmlFileLoaderTest.php b/src/Symfony/Component/DependencyInjection/Tests/Loader/XmlFileLoaderTest.php
@@ -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);`