Merge branch '4.4' into 5.1

nicolas-grekas · nicolas-grekas · commit b108684f6f13 · 2020-12-23T16:26:14.000+01:00
* 4.4:
  Add missing `@return` annotations to fix deprecations on PHP 8
  [ProxyManagerBridge] fix PHP notice, switch to "friendsofphp/proxy-manager-lts"
diff --git a/Tests/Resources/TranslationFilesTest.php b/Tests/Resources/TranslationFilesTest.php
@@ -36,7 +36,9 @@ public function testTranslationFileIsValidWithoutEntityLoader($filePath)
     {
         $document = new \DOMDocument();
         $document->loadXML(file_get_contents($filePath));
-        libxml_disable_entity_loader(true);
+        if (\LIBXML_VERSION < 20900) {
+            libxml_disable_entity_loader(true);
+        }
 
         $errors = XliffUtils::validateSchema($document);
 

Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,9 @@ public function testTranslationFileIsValidWithoutEntityLoader($filePath)`
`36`	`36`	`{`
`37`	`37`	`$document = new \DOMDocument();`
`38`	`38`	`$document->loadXML(file_get_contents($filePath));`
`39`		`- libxml_disable_entity_loader(true);`
	`39`	`+ if (\LIBXML_VERSION < 20900) {`
	`40`	`+ libxml_disable_entity_loader(true);`
	`41`	`+ }`
`40`	`42`
`41`	`43`	`$errors = XliffUtils::validateSchema($document);`
`42`	`44`