diff --git a/src/Symfony/Component/Config/Tests/Util/XmlUtilsTest.php b/src/Symfony/Component/Config/Tests/Util/XmlUtilsTest.php
index 2aecdf8259c65..c964c525e794f 100644
--- a/src/Symfony/Component/Config/Tests/Util/XmlUtilsTest.php
+++ b/src/Symfony/Component/Config/Tests/Util/XmlUtilsTest.php
@@ -199,7 +199,9 @@ public function testLoadEmptyXmlFile()
// test for issue https://github.com/symfony/symfony/issues/9731
public function testLoadWrongEmptyXMLWithErrorHandler()
{
- $originalDisableEntities = libxml_disable_entity_loader(false);
+ if (LIBXML_VERSION < 20900) {
+ $originalDisableEntities = libxml_disable_entity_loader(false);
+ }
$errorReporting = error_reporting(-1);
set_error_handler(function ($errno, $errstr) {
@@ -219,12 +221,13 @@ public function testLoadWrongEmptyXMLWithErrorHandler()
error_reporting($errorReporting);
}
- $disableEntities = libxml_disable_entity_loader(true);
- libxml_disable_entity_loader($disableEntities);
-
- libxml_disable_entity_loader($originalDisableEntities);
+ if (LIBXML_VERSION < 20900) {
+ $disableEntities = libxml_disable_entity_loader(true);
+ libxml_disable_entity_loader($disableEntities);
- $this->assertFalse($disableEntities);
+ libxml_disable_entity_loader($originalDisableEntities);
+ $this->assertFalse($disableEntities);
+ }
// should not throw an exception
XmlUtils::loadFile(__DIR__.'/../Fixtures/Util/valid.xml', __DIR__.'/../Fixtures/Util/schema.xsd');
diff --git a/src/Symfony/Component/Config/Util/XmlUtils.php b/src/Symfony/Component/Config/Util/XmlUtils.php
index c925f315e5ed3..203741ad119cc 100644
--- a/src/Symfony/Component/Config/Util/XmlUtils.php
+++ b/src/Symfony/Component/Config/Util/XmlUtils.php
@@ -51,13 +51,17 @@ public static function parse($content, $schemaOrCallable = null)
}
$internalErrors = libxml_use_internal_errors(true);
- $disableEntities = libxml_disable_entity_loader(true);
+ if (LIBXML_VERSION < 20900) {
+ $disableEntities = libxml_disable_entity_loader(true);
+ }
libxml_clear_errors();
$dom = new \DOMDocument();
$dom->validateOnParse = true;
if (!$dom->loadXML($content, LIBXML_NONET | (\defined('LIBXML_COMPACT') ? LIBXML_COMPACT : 0))) {
- libxml_disable_entity_loader($disableEntities);
+ if (LIBXML_VERSION < 20900) {
+ libxml_disable_entity_loader($disableEntities);
+ }
throw new XmlParsingException(implode("\n", static::getXmlErrors($internalErrors)));
}
@@ -65,7 +69,9 @@ public static function parse($content, $schemaOrCallable = null)
$dom->normalizeDocument();
libxml_use_internal_errors($internalErrors);
- libxml_disable_entity_loader($disableEntities);
+ if (LIBXML_VERSION < 20900) {
+ libxml_disable_entity_loader($disableEntities);
+ }
foreach ($dom->childNodes as $child) {
if (XML_DOCUMENT_TYPE_NODE === $child->nodeType) {
diff --git a/src/Symfony/Component/DependencyInjection/Loader/XmlFileLoader.php b/src/Symfony/Component/DependencyInjection/Loader/XmlFileLoader.php
index cfc13429a1e6a..6754f38767359 100644
--- a/src/Symfony/Component/DependencyInjection/Loader/XmlFileLoader.php
+++ b/src/Symfony/Component/DependencyInjection/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/src/Symfony/Component/DependencyInjection/Tests/Loader/XmlFileLoaderTest.php b/src/Symfony/Component/DependencyInjection/Tests/Loader/XmlFileLoaderTest.php
index 5fbb387bf903a..4740ae2e19014 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Loader/XmlFileLoaderTest.php
+++ b/src/Symfony/Component/DependencyInjection/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.');
}
diff --git a/src/Symfony/Component/DomCrawler/Crawler.php b/src/Symfony/Component/DomCrawler/Crawler.php
index 1f8f993324166..9a0a46e1ca551 100644
--- a/src/Symfony/Component/DomCrawler/Crawler.php
+++ b/src/Symfony/Component/DomCrawler/Crawler.php
@@ -182,7 +182,9 @@ public function addContent($content, $type = null)
public function addHtmlContent($content, $charset = 'UTF-8')
{
$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;
@@ -203,7 +205,9 @@ public function addHtmlContent($content, $charset = 'UTF-8')
}
libxml_use_internal_errors($internalErrors);
- libxml_disable_entity_loader($disableEntities);
+ if (LIBXML_VERSION < 20900) {
+ libxml_disable_entity_loader($disableEntities);
+ }
$this->addDocument($dom);
@@ -246,7 +250,9 @@ public function addXmlContent($content, $charset = 'UTF-8', $options = LIBXML_NO
}
$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;
@@ -256,7 +262,9 @@ public function addXmlContent($content, $charset = 'UTF-8', $options = LIBXML_NO
}
libxml_use_internal_errors($internalErrors);
- libxml_disable_entity_loader($disableEntities);
+ if (LIBXML_VERSION < 20900) {
+ libxml_disable_entity_loader($disableEntities);
+ }
$this->addDocument($dom);
diff --git a/src/Symfony/Component/Serializer/Encoder/XmlEncoder.php b/src/Symfony/Component/Serializer/Encoder/XmlEncoder.php
index fc4cbe5d839f4..412dbb2f375e6 100644
--- a/src/Symfony/Component/Serializer/Encoder/XmlEncoder.php
+++ b/src/Symfony/Component/Serializer/Encoder/XmlEncoder.php
@@ -83,14 +83,18 @@ public function decode($data, $format, array $context = [])
}
$internalErrors = libxml_use_internal_errors(true);
- $disableEntities = libxml_disable_entity_loader(true);
+ if (LIBXML_VERSION < 20900) {
+ $disableEntities = libxml_disable_entity_loader(true);
+ }
libxml_clear_errors();
$dom = new \DOMDocument();
$dom->loadXML($data, $this->loadOptions);
libxml_use_internal_errors($internalErrors);
- libxml_disable_entity_loader($disableEntities);
+ if (LIBXML_VERSION < 20900) {
+ libxml_disable_entity_loader($disableEntities);
+ }
if ($error = libxml_get_last_error()) {
libxml_clear_errors();
diff --git a/src/Symfony/Component/Translation/Loader/XliffFileLoader.php b/src/Symfony/Component/Translation/Loader/XliffFileLoader.php
index 14a2668c27682..00b56f9d568c5 100644
--- a/src/Symfony/Component/Translation/Loader/XliffFileLoader.php
+++ b/src/Symfony/Component/Translation/Loader/XliffFileLoader.php
@@ -189,16 +189,18 @@ private function validateSchema($file, \DOMDocument $dom, $schema)
{
$internalErrors = libxml_use_internal_errors(true);
- $disableEntities = libxml_disable_entity_loader(false);
-
- if (!@$dom->schemaValidateSource($schema)) {
+ if (LIBXML_VERSION < 20900) {
+ $disableEntities = libxml_disable_entity_loader(false);
+ $isValid = @$dom->schemaValidateSource($schema);
libxml_disable_entity_loader($disableEntities);
+ } else {
+ $isValid = @$dom->schemaValidateSource($schema);
+ }
+ if (!$isValid) {
throw new InvalidResourceException(sprintf('Invalid resource provided: "%s"; Errors: ', $file).implode("\n", $this->getXmlErrors($internalErrors)));
}
- libxml_disable_entity_loader($disableEntities);
-
$dom->normalizeDocument();
libxml_clear_errors();
diff --git a/src/Symfony/Component/Translation/Tests/Loader/XliffFileLoaderTest.php b/src/Symfony/Component/Translation/Tests/Loader/XliffFileLoaderTest.php
index 3dcff7b09fbda..ffec90753799c 100644
--- a/src/Symfony/Component/Translation/Tests/Loader/XliffFileLoaderTest.php
+++ b/src/Symfony/Component/Translation/Tests/Loader/XliffFileLoaderTest.php
@@ -49,13 +49,17 @@ public function testLoadWithInternalErrorsEnabled()
public function testLoadWithExternalEntitiesDisabled()
{
- $disableEntities = libxml_disable_entity_loader(true);
+ if (LIBXML_VERSION < 20900) {
+ $disableEntities = libxml_disable_entity_loader(true);
+ }
$loader = new XliffFileLoader();
$resource = __DIR__.'/../fixtures/resources.xlf';
$catalogue = $loader->load($resource, 'en', 'domain1');
- libxml_disable_entity_loader($disableEntities);
+ if (LIBXML_VERSION < 20900) {
+ libxml_disable_entity_loader($disableEntities);
+ }
$this->assertEquals('en', $catalogue->getLocale());
$this->assertEquals([new FileResource($resource)], $catalogue->getResources());
pFad - Phonifier reborn
Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.
Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.
Alternative Proxies:
Alternative Proxy
pFad Proxy
pFad v3 Proxy
pFad v4 Proxy