From 18c19356ee19953def05723c9ac27eabc6fb767d Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Mon, 10 Aug 2020 09:31:28 +0200 Subject: [PATCH] Fix deprecated libxml_disable_entity_loader --- src/Symfony/Component/DomCrawler/Crawler.php | 8 ++++++-- .../Component/Translation/Util/XliffUtils.php | 12 +++++++++--- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/src/Symfony/Component/DomCrawler/Crawler.php b/src/Symfony/Component/DomCrawler/Crawler.php index ab1855494e..a45cc86cb2 100644 --- a/src/Symfony/Component/DomCrawler/Crawler.php +++ b/src/Symfony/Component/DomCrawler/Crawler.php @@ -1184,7 +1184,9 @@ class Crawler implements \Countable, \IteratorAggregate $htmlContent = $this->convertToHtmlEntities($htmlContent, $charset); $internalErrors = libxml_use_internal_errors(true); - $disableEntities = libxml_disable_entity_loader(true); + if (LIBXML_VERSION < 20900) { + $disableEntities = libxml_disable_entity_loader(true); + } $dom = new \DOMDocument('1.0', $charset); $dom->validateOnParse = true; @@ -1194,7 +1196,9 @@ class Crawler implements \Countable, \IteratorAggregate } libxml_use_internal_errors($internalErrors); - libxml_disable_entity_loader($disableEntities); + if (LIBXML_VERSION < 20900) { + libxml_disable_entity_loader($disableEntities); + } return $dom; } diff --git a/src/Symfony/Component/Translation/Util/XliffUtils.php b/src/Symfony/Component/Translation/Util/XliffUtils.php index b5ff4ef4a4..072b2671cb 100644 --- a/src/Symfony/Component/Translation/Util/XliffUtils.php +++ b/src/Symfony/Component/Translation/Util/XliffUtils.php @@ -61,16 +61,22 @@ class XliffUtils { $xliffVersion = static::getVersionNumber($dom); $internalErrors = libxml_use_internal_errors(true); - $disableEntities = libxml_disable_entity_loader(false); + if (LIBXML_VERSION < 20900) { + $disableEntities = libxml_disable_entity_loader(false); + } $isValid = @$dom->schemaValidateSource(self::getSchema($xliffVersion)); if (!$isValid) { - libxml_disable_entity_loader($disableEntities); + if (LIBXML_VERSION < 20900) { + libxml_disable_entity_loader($disableEntities); + } return self::getXmlErrors($internalErrors); } - libxml_disable_entity_loader($disableEntities); + if (LIBXML_VERSION < 20900) { + libxml_disable_entity_loader($disableEntities); + } $dom->normalizeDocument();