From 3c6151231ce9b4d99cfd1695f7d4f396b14e6f28 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Deruss=C3=A9?= Date: Fri, 7 Aug 2020 11:40:57 +0200 Subject: [PATCH] Fix deprecated libxml_disable_entity_loader --- Loader/XmlFileLoader.php | 10 +++++++--- Tests/Loader/XmlFileLoaderTest.php | 8 ++++++-- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/Loader/XmlFileLoader.php b/Loader/XmlFileLoader.php index cfc13429a..6754f3876 100644 --- a/Loader/XmlFileLoader.php +++ b/Loader/XmlFileLoader.php @@ -620,9 +620,13 @@ public function validateSchema(\DOMDocument $dom) EOF ; - $disableEntities = libxml_disable_entity_loader(false); - $valid = @$dom->schemaValidateSource($source); - libxml_disable_entity_loader($disableEntities); + if (LIBXML_VERSION < 20900) { + $disableEntities = libxml_disable_entity_loader(false); + $valid = @$dom->schemaValidateSource($source); + libxml_disable_entity_loader($disableEntities); + } else { + $valid = @$dom->schemaValidateSource($source); + } foreach ($tmpfiles as $tmpfile) { @unlink($tmpfile); diff --git a/Tests/Loader/XmlFileLoaderTest.php b/Tests/Loader/XmlFileLoaderTest.php index 5fbb387bf..4740ae2e1 100644 --- a/Tests/Loader/XmlFileLoaderTest.php +++ b/Tests/Loader/XmlFileLoaderTest.php @@ -95,13 +95,17 @@ public function testParseFile() public function testLoadWithExternalEntitiesDisabled() { - $disableEntities = libxml_disable_entity_loader(true); + if (LIBXML_VERSION < 20900) { + $disableEntities = 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($disableEntities); + if (LIBXML_VERSION < 20900) { + libxml_disable_entity_loader($disableEntities); + } $this->assertGreaterThan(0, $containerBuilder->getParameterBag()->all(), 'Parameters can be read from the config file.'); }