Skip to content

Commit 05a37d6

Browse files
committed
Merge branch '3.4' into 4.4
* 3.4: Add Tagalog translations for validator messages 94, 95, 96 and 99 PHPUnit's assertContains() performs strict comparisons now. [ClassLoader][Routing] Fix namespace parsing on php 8. Fix deprecated libxml_disable_entity_loader Made reference to PHPUnit\Util\XML::loadfile php5-compatible. [Validator] Add missing translations for german and vietnamese Modernized deprecated PHPUnit assertion calls [Console] The message of "class not found" errors has changed in php 8. The PHPUnit\Util\XML class has been removed in PHPUnit 9.3. [Console] Make sure we pass a numeric array of arguments to call_user_func_array(). [Serializer] Fix that it will never reach DOMNode [Validator] sync translations [VarDumper] Improve previous fix on light array coloration [Cache] Fix #37667
2 parents 72b3a65 + 702ee65 commit 05a37d6

File tree

1 file changed

+6
-2
lines changed

1 file changed

+6
-2
lines changed

Crawler.php

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -231,7 +231,9 @@ public function addXmlContent($content, $charset = 'UTF-8', $options = LIBXML_NO
231231
}
232232

233233
$internalErrors = libxml_use_internal_errors(true);
234-
$disableEntities = libxml_disable_entity_loader(true);
234+
if (LIBXML_VERSION < 20900) {
235+
$disableEntities = libxml_disable_entity_loader(true);
236+
}
235237

236238
$dom = new \DOMDocument('1.0', $charset);
237239
$dom->validateOnParse = true;
@@ -241,7 +243,9 @@ public function addXmlContent($content, $charset = 'UTF-8', $options = LIBXML_NO
241243
}
242244

243245
libxml_use_internal_errors($internalErrors);
244-
libxml_disable_entity_loader($disableEntities);
246+
if (LIBXML_VERSION < 20900) {
247+
libxml_disable_entity_loader($disableEntities);
248+
}
245249

246250
$this->addDocument($dom);
247251

0 commit comments

Comments
 (0)